Fix for issue #8577: without this patch test_distutils

will fail when builddir != srcdir (that is, when you
run configure in a directory that is not the top of
the source tree).

diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py
index 3c28c660ec89bcf20db30b2c5a457ea3dbedbf5a..e3e387ab5d59f30b39bb5d6484a6c2dff77ae844 100644 (file)
--- a/Lib/distutils/command/install.py
+++ b/Lib/distutils/command/install.py
@@ -302,8 +302,8 @@ class install(Command):
         # about needing recursive variable expansion (shudder).
 
         py_version = sys.version.split()[0]
-        prefix, exec_prefix, srcdir = get_config_vars('prefix', 'exec_prefix',
-                                                      'srcdir')
+        prefix, exec_prefix, srcdir, projectbase = get_config_vars('prefix', 'exec_prefix',
+                                                      'srcdir', 'projectbase')
 
         self.config_vars = {'dist_name': self.distribution.get_name(),
                             'dist_version': self.distribution.get_version(),
@@ -316,6 +316,7 @@ class install(Command):
                             'sys_exec_prefix': exec_prefix,
                             'exec_prefix': exec_prefix,
                             'srcdir': srcdir,
+                            'projectbase': projectbase,
                            }
 
         self.config_vars['userbase'] = self.install_userbase

diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
index 731aed3bbc598fea3d22bf30a2704a639621cdb7..91298d1661c3ac9428312f53c09d5d8b12ea6fbb 100644 (file)
--- a/Lib/sysconfig.py
+++ b/Lib/sysconfig.py
@@ -123,8 +123,8 @@ _PYTHON_BUILD = is_python_build()
 
 if _PYTHON_BUILD:
     for scheme in ('posix_prefix', 'posix_home'):
-        _INSTALL_SCHEMES[scheme]['include'] = '{projectbase}/Include'
-        _INSTALL_SCHEMES[scheme]['platinclude'] = '{srcdir}'
+        _INSTALL_SCHEMES[scheme]['include'] = '{srcdir}/Include'
+        _INSTALL_SCHEMES[scheme]['platinclude'] = '{projectbase}/.'
 
 def _subst_vars(s, local_vars):
     try: