mirror of https://gitlab.com/ita1024/waf.git
Regression on windows caused by r823b4cd2dc03d06a81e0ab003606067da03d8745 (default bindir and libdir)
This commit is contained in:
parent
a933244f48
commit
c4e25382cd
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue