Fixed bug #1613: Makefile's VPATH feature is broken

diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
index 2ea7c78b8397d3aa332ab4009ade2593f04ef8cb..aead1a19ba6d4720698c08c3bef1d916ba9e6c58 100644 (file)
--- a/Lib/distutils/sysconfig.py
+++ b/Lib/distutils/sysconfig.py
@@ -32,7 +32,7 @@ if os.name == "nt" and "pcbuild" in project_base[-8:].lower():
 # building an extension with an un-installed Python, so we use
 # different (hard-wired) directories.
 python_build = os.path.isfile(os.path.join(project_base, "Modules",
-                                           "Setup.dist"))
+                                           "Setup.local"))
 
 
 def get_python_version():

diff --git a/README b/README
index 65ae8ed46ddf2adf485bb4f23aaba755b20cb55b..1ebdcf91bc91758e4442423d516762e393606291 100644 (file)
--- a/README
+++ b/README
@@ -1157,6 +1157,9 @@ fancy you can change the rules to create an empty Setup.local if it
 doesn't exist and run it with arguments $(srcdir)/Setup Setup.local;
 however this assumes that you only need to add modules.)
 
+Also note that you can't use a workspace for VPATH and non VPATH builds. The
+object files left behind by one version confuses the other.
+
 
 Building on non-UNIX systems
 ----------------------------