FWGS/waf
2
0
Fork 0
mirror of https://gitlab.com/ita1024/waf.git synced 2024-11-22 18:07:12 +01:00
Code Issues Projects Releases Wiki Activity

#1202

Browse Source
This commit is contained in:
Thomas Nagy 2012-09-23 19:49:17 +02:00
parent 665aff8a57
commit ab385ea63c
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -6,6 +6,8 @@ NEW IN WAF 1.7.3
* Use the same function signature main(int, char**) in all configuration tests #1192
* Fixed the Clang version number detection #1191
* Let the feature 'includes' propagate INCLUDES and FRAMEWORKPATH variables
* Fix for incorrect installation paths #1202
* Cabal script (haskell)
NEW IN WAF 1.7.2
----------------

7
waflib/Tools/gnu_dirs.py
View File

@ -78,10 +78,6 @@ def configure(conf):
env = conf.env
env.LIBDIR = env.BINDIR = []
env.EXEC_PREFIX = get_param('EXEC_PREFIX', env.PREFIX)
corner_case = False
if str(env.PREFIX) == '/usr': # Issue 722, corner case
corner_case = True
env.PREFIX = ''
env.PACKAGE = getattr(Context.g_module, 'APPNAME', None) or env.PACKAGE
complete = False
@ -97,9 +93,6 @@ def configure(conf):
except TypeError:
complete = False
if corner_case:
env.PREFIX = '/usr'
if not complete:
lst = [name for name, _, _ in _options if not env[name.upper()]]
raise conf.errors.WafError('Variable substitution failure %r' % lst)