FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Regression on windows caused by r823b4cd2dc03d06a81e0ab003606067da03d8745 (default bindir and libdir)

This commit is contained in:
Thomas Nagy 2015-02-23 17:03:48 +01:00
parent a933244f48
commit c4e25382cd
No known key found for this signature in database
GPG Key ID: 67A565EDFDF90E64
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
waflib/Configure.py
View File

@ -212,12 +212,12 @@ class ConfigurationContext(Context.Context):
else:
env.PREFIX = ''
if not env.BINDIR:
if Options.options.bindir or Utils.is_win32:
if Options.options.bindir:
env.BINDIR = os.path.abspath(os.path.expanduser(Options.options.bindir))
else:
env.BINDIR = Utils.subst_vars('${PREFIX}/bin', env)
if not env.LIBDIR:
if Options.options.libdir or Utils.is_win32:
if Options.options.libdir:
env.LIBDIR = os.path.abspath(os.path.expanduser(Options.options.libdir))
else:
env.LIBDIR = Utils.subst_vars('${PREFIX}/lib%s' % Utils.lib64(), env)