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

Fix prefix and datadir usage

Browse source
This commit is contained in:
Christian Dywan 2008-12-07 05:58:40 +01:00
parent 588744fdda
commit 7e68ef90c0
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
wscript
View file

@ -196,12 +196,12 @@ def set_options (opt):
group = opt.add_option_group ('Directories', '') group = opt.add_option_group ('Directories', '')
if (opt.parser.get_option ('--prefix')): if (opt.parser.get_option ('--prefix')):
opt.parser.remove_option ('--prefix') opt.parser.remove_option ('--prefix')
group.add_option ('--prefix', type='string', default='/usr/local', group.add_option ('--prefix', type='string', default='/usr/local',
help='installation prefix (configuration only)', dest='prefix') help='installation prefix (configuration only)', dest='prefix')
if (opt.parser.get_option ('--datadir')): if (opt.parser.get_option ('--datadir')):
opt.parser.remove_option ('--datadir') opt.parser.remove_option ('--datadir')
group.add_option ('--datadir', type='string', default='', group.add_option ('--datadir', type='string', default='',
help='read-only application data', dest='prefix') help='read-only application data', dest='datadir')
group.add_option ('--docdir', type='string', default='', group.add_option ('--docdir', type='string', default='',
help='Documentation root', dest='docdir') help='Documentation root', dest='docdir')
group.add_option ('--libdir', type='string', default='', group.add_option ('--libdir', type='string', default='',
@ -255,7 +255,7 @@ def build (bld):
'../../../docs/user/midori.txt', '../../../docs/user/midori.txt',
'midori.html',]) 'midori.html',])
os.chdir ('../../..') os.chdir ('../../..')
install_files ('DOCDIR', '/midori/user/', blddir + '/docs/user/midori.html') _install_files ('DOCDIR', '/midori/user/', blddir + '/docs/user/midori.html')
if bld.env ()['INTLTOOL']: if bld.env ()['INTLTOOL']:
obj = bld.create_obj ('intltool_po') obj = bld.create_obj ('intltool_po')
@ -264,6 +264,7 @@ def build (bld):
if bld.env ()['GTKDOC_SCAN'] and Params.g_commands['build']: if bld.env ()['GTKDOC_SCAN'] and Params.g_commands['build']:
bld.add_subdirs ('docs/api') bld.add_subdirs ('docs/api')
_install_files ('DOCDIR', '/midori/api/', blddir + '/docs/api/*')
if bld.env ()['INTLTOOL']: if bld.env ()['INTLTOOL']:
obj = bld.create_obj ('intltool_in') obj = bld.create_obj ('intltool_in')
@ -271,7 +272,7 @@ def build (bld):
obj.inst_var = 'DATADIR' obj.inst_var = 'DATADIR'
obj.inst_dir = 'applications' obj.inst_dir = 'applications'
obj.flags = '-d' obj.flags = '-d'
install_files ('DATADIR', 'applications', APPNAME + '.desktop') _install_files ('DATADIR', 'applications', APPNAME + '.desktop')
else: else:
folder = os.path.dirname (bld.env ()['waf_config_files'][0]) folder = os.path.dirname (bld.env ()['waf_config_files'][0])
desktop = APPNAME + '.desktop' desktop = APPNAME + '.desktop'