diff options
| author | Christian Heimes <christian@cheimes.de> | 2007-12-14 23:42:36 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2007-12-14 23:42:36 (GMT) |
| commit | c67a15d86552245f1a55b58e319ffda345196854 (patch) | |
| tree | feced34dfc384aca47a71484efebf1b358615c02 /Lib | |
| parent | 90921cc4b50cb58f8b91067313c3a1d441638255 (diff) | |
| download | cpython-c67a15d86552245f1a55b58e319ffda345196854.zip cpython-c67a15d86552245f1a55b58e319ffda345196854.tar.gz cpython-c67a15d86552245f1a55b58e319ffda345196854.tar.bz2 | |
Fixed bug #1628
The detection now works on Unix with Makefile, Makefile with VPATH and on Windows.
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/distutils/sysconfig.py | 6 | ||||
| -rw-r--r-- | Lib/distutils/tests/test_sysconfig.py | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py index aead1a1..32b165f 100644 --- a/Lib/distutils/sysconfig.py +++ b/Lib/distutils/sysconfig.py @@ -31,8 +31,10 @@ if os.name == "nt" and "pcbuild" in project_base[-8:].lower(): # python_build: (Boolean) if true, we're either building Python or # 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.local")) +# Setup.local is available for Makefile builds including VPATH builds, +# Setup.dist is available on Windows +python_build = any(os.path.isfile(os.path.join(project_base, "Modules", fn)) + for fn in ("Setup.dist", "Setup.local")) def get_python_version(): diff --git a/Lib/distutils/tests/test_sysconfig.py b/Lib/distutils/tests/test_sysconfig.py index ef7c38b..770b7c3 100644 --- a/Lib/distutils/tests/test_sysconfig.py +++ b/Lib/distutils/tests/test_sysconfig.py @@ -15,7 +15,7 @@ class SysconfigTestCase(unittest.TestCase): def test_get_python_lib(self): lib_dir = sysconfig.get_python_lib() - # XXX doesn't work on Inux when Python was never installed before + # XXX doesn't work on Linux when Python was never installed before #self.assert_(os.path.isdir(lib_dir), lib_dir) # test for pythonxx.lib? |