FWGS/waf
2
0
Fork 0
mirror of https://gitlab.com/ita1024/waf.git synced 2024-11-29 21:41:44 +01:00
Code Issues Projects Releases Wiki Activity

Obtain the default prefix from the wscript file if provided

Browse Source
This commit is contained in:
Thomas Nagy 2014-10-01 01:11:05 +02:00
parent f748a01907
commit a3b59a5c02
No known key found for this signature in database
GPG Key ID: 67A565EDFDF90E64
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
waflib/Options.py
View File

@ -125,7 +125,7 @@ class OptionsContext(Context.Context):
gr.add_option('-o', '--out', action='store', default='', help='build dir for the project', dest='out')
gr.add_option('-t', '--top', action='store', default='', help='src dir for the project', dest='top')
default_prefix = os.environ.get('PREFIX')
default_prefix = getattr(Context.g_module, 'default_prefix', os.environ.get('PREFIX'))
if not default_prefix:
if platform == 'win32':
d = tempfile.gettempdir()

1
waflib/extras/compat15.py
View File

@ -110,6 +110,7 @@ Configure.ConfigurationContext.sub_config = Configure.ConfigurationContext.recur
Configure.ConfigurationContext.check_tool = Configure.ConfigurationContext.load
Configure.conftest = Configure.conf
Configure.ConfigurationError = Errors.ConfigurationError
Utils.WafError = Errors.WafError
Options.OptionsContext.sub_options = Options.OptionsContext.recurse
Options.OptionsContext.tool_options = Context.Context.load