debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Follow up to correct custom docdir location

Browse source
This commit is contained in:
Christian Dywan 2010-11-01 21:21:58 +01:00
parent eae7ec4ac3
commit 32d80dcfad
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
midori/midori-browser.c
View file

@ -4514,8 +4514,8 @@ _action_help_link_activate (GtkAction* action,
uri = free_uri = g_filename_to_uri (path, NULL, NULL); uri = free_uri = g_filename_to_uri (path, NULL, NULL);
if (g_access (path, F_OK) != 0) if (g_access (path, F_OK) != 0)
{ {
if (g_access (DOCDIR "/midori/user/midori.html", F_OK) == 0) if (g_access (DOCDIR "/user/midori.html", F_OK) == 0)
uri = "file://" DOCDIR "/midori/user/midori.html"; uri = "file://" DOCDIR "/user/midori.html";
else else
#endif #endif
uri = "error:nodocs share/doc/midori/user/midori.html"; uri = "error:nodocs share/doc/midori/user/midori.html";
@ -4526,10 +4526,10 @@ _action_help_link_activate (GtkAction* action,
} }
#else #else
#ifdef DOCDIR #ifdef DOCDIR
uri = "file://" DOCDIR "/midori/user/midori.html"; uri = "file://" DOCDIR "/user/midori.html";
if (g_access (DOCDIR "/midori/user/midori.html", F_OK) != 0) if (g_access (DOCDIR "/user/midori.html", F_OK) != 0)
#endif #endif
uri = "error:nodocs " DOCDIR "/midori/user/midori.html"; uri = "error:nodocs " DOCDIR "/user/midori.html";
#endif #endif
} }
else if (!strncmp ("HelpFAQ", action_name, 7)) else if (!strncmp ("HelpFAQ", action_name, 7))

3
wscript
View file

@ -161,6 +161,7 @@ def configure (conf):
dirname_default ('DOCDIR', os.path.join (conf.env['MDATADIR'], 'doc')) dirname_default ('DOCDIR', os.path.join (conf.env['MDATADIR'], 'doc'))
if not APPNAME in conf.env['DOCDIR']: if not APPNAME in conf.env['DOCDIR']:
conf.env['DOCDIR'] += '/' + APPNAME conf.env['DOCDIR'] += '/' + APPNAME
conf.define ('DOCDIR', conf.env['DOCDIR'])
if option_enabled ('apidocs'): if option_enabled ('apidocs'):
conf.find_program ('gtkdoc-scan', var='GTKDOC_SCAN') conf.find_program ('gtkdoc-scan', var='GTKDOC_SCAN')
@ -417,7 +418,7 @@ def build (bld):
bld.add_group () bld.add_group ()
if bld.env['docs']: if bld.env['docs']:
bld.install_files ('${DOCDIR}/' + '/', \ bld.install_files ('${DOCDIR}/', \
'AUTHORS COPYING ChangeLog EXPAT README') 'AUTHORS COPYING ChangeLog EXPAT README')
# Install default configuration # Install default configuration