From: Michael W. Hudson <mwh@python.net>
Date: Tue, 26 Nov 2002 09:42:57 +0000 (+0000)
Subject: Backport my (!) revision 1.50:
X-Git-Tag: v2.2.3c1~217
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=95f1a7837836358b9823f1de6322869d1eb56460;p=thirdparty%2FPython%2Fcpython.git

Backport my (!) revision 1.50:

Well, Fred never did explain why the code to determine whether the
calling Python was installed was so complicated, so I simplified it.

This should get the snake-farm's build scripts working again.
---

diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
index fa4a3029488d..7c16d51a3ea5 100644
--- a/Lib/distutils/sysconfig.py
+++ b/Lib/distutils/sysconfig.py
@@ -29,13 +29,9 @@ EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
 
 argv0_path = os.path.dirname(os.path.abspath(sys.executable))
 landmark = os.path.join(argv0_path, "Modules", "Setup")
-if not os.path.isfile(landmark):
-    python_build = 0
-elif os.path.isfile(os.path.join(argv0_path, "Lib", "os.py")):
-    python_build = 1
-else:
-    python_build = os.path.isfile(os.path.join(os.path.dirname(argv0_path),
-                                               "Lib", "os.py"))
+
+python_build = os.path.isfile(landmark)
+
 del argv0_path, landmark
 
 # set_python_build() was present in 2.2 and 2.2.1; it's not needed