From 32d80dcfade613f0435ebca3537edcdc0d7e7acd Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 1 Nov 2010 21:21:58 +0100 Subject: [PATCH] Follow up to correct custom docdir location --- midori/midori-browser.c | 10 +++++----- wscript | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index c97c8441..77428109 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -4514,8 +4514,8 @@ _action_help_link_activate (GtkAction* action, uri = free_uri = g_filename_to_uri (path, NULL, NULL); if (g_access (path, F_OK) != 0) { - if (g_access (DOCDIR "/midori/user/midori.html", F_OK) == 0) - uri = "file://" DOCDIR "/midori/user/midori.html"; + if (g_access (DOCDIR "/user/midori.html", F_OK) == 0) + uri = "file://" DOCDIR "/user/midori.html"; else #endif uri = "error:nodocs share/doc/midori/user/midori.html"; @@ -4526,10 +4526,10 @@ _action_help_link_activate (GtkAction* action, } #else #ifdef DOCDIR - uri = "file://" DOCDIR "/midori/user/midori.html"; - if (g_access (DOCDIR "/midori/user/midori.html", F_OK) != 0) + uri = "file://" DOCDIR "/user/midori.html"; + if (g_access (DOCDIR "/user/midori.html", F_OK) != 0) #endif - uri = "error:nodocs " DOCDIR "/midori/user/midori.html"; + uri = "error:nodocs " DOCDIR "/user/midori.html"; #endif } else if (!strncmp ("HelpFAQ", action_name, 7)) diff --git a/wscript b/wscript index fe95e567..4da15d08 100644 --- a/wscript +++ b/wscript @@ -161,6 +161,7 @@ def configure (conf): dirname_default ('DOCDIR', os.path.join (conf.env['MDATADIR'], 'doc')) if not APPNAME in conf.env['DOCDIR']: conf.env['DOCDIR'] += '/' + APPNAME + conf.define ('DOCDIR', conf.env['DOCDIR']) if option_enabled ('apidocs'): conf.find_program ('gtkdoc-scan', var='GTKDOC_SCAN') @@ -417,7 +418,7 @@ def build (bld): bld.add_group () if bld.env['docs']: - bld.install_files ('${DOCDIR}/' + '/', \ + bld.install_files ('${DOCDIR}/', \ 'AUTHORS COPYING ChangeLog EXPAT README') # Install default configuration