]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
- Issue #11171: Fix detection of config/Makefile when --prefix !=
authorBarry Warsaw <barry@python.org>
Mon, 14 Feb 2011 20:04:00 +0000 (20:04 +0000)
committerBarry Warsaw <barry@python.org>
Mon, 14 Feb 2011 20:04:00 +0000 (20:04 +0000)
  --exec-prefix, which caused Python to not start.

Lib/sysconfig.py
Misc/NEWS

index 33b27915360e7731ca59fa08ace9e6255443f6a8..77402d8ab7ef20a65cd2a2c5ed4bbf3758fc723b 100644 (file)
@@ -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):
index 4a2ff935bec749574e2c1b61071ab5b6f5727cd7..40c564435a39348f00269e74ec6d9c863d8e7d07 100644 (file)
--- 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.