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

Store 'addons' and 'docs' configure options persistently

Browse source
This commit is contained in:
Christian Dywan 2009-06-06 06:37:55 +02:00
parent 27c3c2a26c
commit 923841e079
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
wscript
View file

@ -191,6 +191,11 @@ def configure (conf):
hildon = 'no ' hildon = 'no '
conf.define ('HAVE_HILDON', [0,1][hildon == 'yes']) conf.define ('HAVE_HILDON', [0,1][hildon == 'yes'])
# Store options in env, since 'Options' is not persistent
if 'CC' in os.environ: conf.env['CC'] = os.environ['CC']
conf.env['addons'] = option_enabled ('addons')
conf.env['docs'] = option_enabled ('docs')
conf.check (header_name='unistd.h') conf.check (header_name='unistd.h')
conf.define ('HAVE_OSX', int(sys.platform == 'darwin')) conf.define ('HAVE_OSX', int(sys.platform == 'darwin'))
@ -297,12 +302,12 @@ def set_options (opt):
def build (bld): def build (bld):
bld.add_subdirs ('katze midori icons') bld.add_subdirs ('katze midori icons')
if option_enabled ('addons'): if bld.env['addons']:
bld.add_subdirs ('extensions') bld.add_subdirs ('extensions')
bld.add_group () bld.add_group ()
if option_enabled ('docs'): if bld.env['docs']:
bld.install_files ('${DOCDIR}/' + APPNAME + '/', \ bld.install_files ('${DOCDIR}/' + APPNAME + '/', \
'AUTHORS ChangeLog COPYING EXPAT README TRANSLATE') 'AUTHORS ChangeLog COPYING EXPAT README TRANSLATE')