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

--docdir should take not add 'midori' folder if given

Browse source 
So it is possible to pass either /usr/share/docdir or
/usr/share/doc/midori-0.2.9 as appropriate.
This commit is contained in:
Christian Dywan 2010-10-18 22:17:19 +02:00
parent 068ff32a72
commit 66303e6c95
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
wscript
View file

@ -159,6 +159,8 @@ def configure (conf):
'MDATADIR') 'MDATADIR')
conf.undefine ('DATADIR') conf.undefine ('DATADIR')
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']:
conf.env['DOCDIR'] += '/' + APPNAME
if option_enabled ('apidocs'): if option_enabled ('apidocs'):
conf.find_program ('gtkdoc-scan', var='GTKDOC_SCAN') conf.find_program ('gtkdoc-scan', var='GTKDOC_SCAN')
@ -415,7 +417,7 @@ def build (bld):
bld.add_group () bld.add_group ()
if bld.env['docs']: if bld.env['docs']:
bld.install_files ('${DOCDIR}/' + APPNAME + '/', \ bld.install_files ('${DOCDIR}/' + '/', \
'AUTHORS COPYING ChangeLog EXPAT README') 'AUTHORS COPYING ChangeLog EXPAT README')
# Install default configuration # Install default configuration
@ -432,7 +434,7 @@ def build (bld):
'../../../docs/user/midori.txt ' + 'midori.html' '../../../docs/user/midori.txt ' + 'midori.html'
Utils.exec_command (command) Utils.exec_command (command)
os.chdir ('../../..') os.chdir ('../../..')
bld.install_files ('${DOCDIR}/midori/user/', blddir + '/docs/user/midori.html') bld.install_files ('${DOCDIR}/user/', blddir + '/docs/user/midori.html')
if bld.env['INTLTOOL']: if bld.env['INTLTOOL']:
obj = bld.new_task_gen ('intltool_po') obj = bld.new_task_gen ('intltool_po')
@ -441,7 +443,7 @@ def build (bld):
if bld.env['GTKDOC_SCAN'] and Options.commands['build']: if bld.env['GTKDOC_SCAN'] and Options.commands['build']:
bld.add_subdirs ('docs/api') bld.add_subdirs ('docs/api')
bld.install_files ('${DOCDIR}/midori/api/', blddir + '/docs/api/*') bld.install_files ('${DOCDIR}/api/', blddir + '/docs/api/*')
if not is_mingw (bld.env) and Options.platform != 'win32': if not is_mingw (bld.env) and Options.platform != 'win32':
if bld.env['HAVE_HILDON']: if bld.env['HAVE_HILDON']: