Install autosuggestcontrol.js/.css into res like the other files

diff --git a/extensions/formhistory.c b/extensions/formhistory.c
index 0cb119cadc8fba1946539780096e06326fad2b16..e21502e49559e9c1194e0d090346c8b30258226b 100644 (file)
--- a/extensions/formhistory.c
+++ b/extensions/formhistory.c
@@ -30,7 +30,7 @@ formhistory_prepare_js ()
    guint i;
    gchar* file;
 
-   gchar* data_path = g_build_filename (MDATADIR, PACKAGE_NAME, NULL);
+   gchar* data_path = g_build_filename (MDATADIR, PACKAGE_NAME, "res", NULL);
    file = g_build_filename (data_path,"/autosuggestcontrol.js",NULL);
    if (!g_file_test (file, G_FILE_TEST_EXISTS))
        return FALSE;

diff --git a/wscript b/wscript
index 9f345ae633792a4a355a4f354c8f5fc893020887..4fa438d11b6dcd5b1ae95f803979bd626370885c 100644 (file)
--- a/wscript
+++ b/wscript
@@ -453,8 +453,8 @@ def build (bld):
     bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/speeddial-head.html')
     bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/speeddial.json')
     bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/mootools.js')
-    bld.install_files ('${MDATADIR}/' + APPNAME, 'data/autosuggestcontrol.js')
-    bld.install_files ('${MDATADIR}/' + APPNAME, 'data/autosuggestcontrol.css')
+    bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/autosuggestcontrol.js')
+    bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/autosuggestcontrol.css')
 
     # FIXME: Determine the library naming for other platforms
     if Options.platform == 'linux':