[Xfce4-commits] <midori:master> Install autosuggestcontrol.js/.css into res like the other files

[Christian Dywan]

Updating branch refs/heads/master
         to 6b0f38e51a9392a40737ce5e2c4c8286eb3af1d9 (commit)
       from 69a2defed9e33035e03b866dfbcd5e7d2aa7517a (commit)

commit 6b0f38e51a9392a40737ce5e2c4c8286eb3af1d9
Author: Christian Dywan <christian at twotoasts.de>
Date:   Tue Oct 20 23:54:26 2009 +0200

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

 extensions/formhistory.c |    2 +-
 wscript                  |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/formhistory.c b/extensions/formhistory.c
index 0cb119c..e21502e 100644
--- 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 9f345ae..4fa438d 100644
--- 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':