Merge pull request #1554 from dsvensson/master

Use same prefix convention for python as with ruby and perl.
This commit is contained in:
ita1024 2015-04-11 18:57:49 +02:00
commit 7d039ef84c
1 changed files with 2 additions and 2 deletions

View File

@ -461,7 +461,7 @@ def check_python_version(conf, minver=None):
"get_python_lib(standard_lib=0) or ''"])
else:
python_LIBDEST = None
(pydir,) = conf.get_python_variables( ["get_python_lib(standard_lib=0) or ''"])
(pydir,) = conf.get_python_variables( ["get_python_lib(standard_lib=0, prefix='%s') or ''" % conf.env['PREFIX']])
if python_LIBDEST is None:
if conf.env['LIBDIR']:
python_LIBDEST = os.path.join(conf.env['LIBDIR'], "python" + pyver)
@ -476,7 +476,7 @@ def check_python_version(conf, minver=None):
pyarchdir = conf.environ['PYTHONARCHDIR']
else:
# Finally, try to guess
(pyarchdir, ) = conf.get_python_variables( ["get_python_lib(plat_specific=1, standard_lib=0) or ''"])
(pyarchdir, ) = conf.get_python_variables( ["get_python_lib(plat_specific=1, standard_lib=0, prefix='%s') or ''" % conf.env['PREFIX']])
if not pyarchdir:
pyarchdir = pydir