summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-10-07 23:56:52 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-10-07 23:56:52 (GMT)
commitfea2d04bb9697002569f8fa1d04f80ca4e912bbf (patch)
tree5367e05e1cde457f106dab507cb27481b50f0e1b
parentde504550afc211dbc7c203fac0646f5e1329a158 (diff)
downloadcpython-fea2d04bb9697002569f8fa1d04f80ca4e912bbf.zip
cpython-fea2d04bb9697002569f8fa1d04f80ca4e912bbf.tar.gz
cpython-fea2d04bb9697002569f8fa1d04f80ca4e912bbf.tar.bz2
Fix distutils.sysconfig.get_makefile_filename when prefix != exec-prefix
-rw-r--r--Lib/distutils/sysconfig.py2
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
index 5ea724c..ac06313 100644
--- a/Lib/distutils/sysconfig.py
+++ b/Lib/distutils/sysconfig.py
@@ -218,7 +218,7 @@ def get_makefile_filename():
"""Return full pathname of installed Makefile from the Python build."""
if python_build:
return os.path.join(os.path.dirname(sys.executable), "Makefile")
- lib_dir = get_python_lib(plat_specific=1, standard_lib=1)
+ lib_dir = get_python_lib(plat_specific=0, standard_lib=1)
config_file = 'config-{}{}'.format(get_python_version(), build_flags)
return os.path.join(lib_dir, config_file, 'Makefile')
diff --git a/Misc/NEWS b/Misc/NEWS
index a55fcb3..dfbeb4d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -43,6 +43,9 @@ Core and Builtins
Library
-------
+- Fix distutils.sysconfig.get_makefile_filename when Python was configured with
+ different prefix and exec-prefix.
+
- Issue #11254: Teach distutils to compile .pyc and .pyo files in
PEP 3147-compliant __pycache__ directories.