From: Barry Warsaw <barry@python.org>
Date: Mon, 14 Feb 2011 20:04:00 +0000 (+0000)
Subject: - Issue #11171: Fix detection of config/Makefile when --prefix !=
X-Git-Tag: v2.7.2rc1~322
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=42bb7ca9e4559222e22aa44f30f8854e2110b9b8;p=thirdparty%2FPython%2Fcpython.git

- Issue #11171: Fix detection of config/Makefile when --prefix !=
  --exec-prefix, which caused Python to not start.
---

diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
index 33b27915360e..77402d8ab7ef 100644
--- a/Lib/sysconfig.py
+++ b/Lib/sysconfig.py
@@ -271,7 +271,7 @@ def _parse_makefile(filename, vars=None):
 def _get_makefile_filename():
     if _PYTHON_BUILD:
         return os.path.join(_PROJECT_BASE, "Makefile")
-    return os.path.join(get_path('stdlib'), "config", "Makefile")
+    return os.path.join(get_path('platstdlib'), "config", "Makefile")
 
 
 def _init_posix(vars):
diff --git a/Misc/NEWS b/Misc/NEWS
index 4a2ff935bec7..40c564435a39 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -37,6 +37,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #11171: Fix detection of config/Makefile when --prefix !=
+  --exec-prefix, which caused Python to not start.
+
 - Issue #11116: any error during addition of a message to a mailbox now causes
   a rollback, instead of leaving the mailbox partially modified.