# HG changeset patch
# Parent a970054a93fb0861edef6c6701b37ba6f5772ac8

diff -r a970054a93fb Lib/sysconfig.py
--- a/Lib/sysconfig.py	Mon Jul 16 18:30:03 2012 +0100
+++ b/Lib/sysconfig.py	Mon Jul 16 23:50:59 2012 +0100
@@ -533,28 +533,13 @@
         # the init-function.
         _CONFIG_VARS['userbase'] = _getuserbase()
 
-        if 'srcdir' not in _CONFIG_VARS:
-            _CONFIG_VARS['srcdir'] = _PROJECT_BASE
-        else:
-            _CONFIG_VARS['srcdir'] = _safe_realpath(_CONFIG_VARS['srcdir'])
-
-        # Convert srcdir into an absolute path if it appears necessary.
-        # Normally it is relative to the build directory.  However, during
-        # testing, for example, we might be running a non-installed python
-        # from a different directory.
-        if _PYTHON_BUILD and os.name == "posix":
-            base = _PROJECT_BASE
-            try:
-                cwd = os.getcwd()
-            except OSError:
-                cwd = None
-            if (not os.path.isabs(_CONFIG_VARS['srcdir']) and
-                base != cwd):
-                # srcdir is relative and we are not in the same directory
-                # as the executable. Assume executable is in the build
-                # directory and make srcdir absolute.
-                srcdir = os.path.join(base, _CONFIG_VARS['srcdir'])
-                _CONFIG_VARS['srcdir'] = os.path.normpath(srcdir)
+        # Always convert srcdir to an absolute path
+        srcdir = _CONFIG_VARS.get('srcdir', _PROJECT_BASE)
+        if os.name == 'posix' and not os.path.isabs(srcdir):
+            # srcdir is relative to the directory containing Makefile
+            base = os.path.dirname(get_makefile_filename())
+            srcdir = os.path.join(base, srcdir)
+        _CONFIG_VARS['srcdir'] = _safe_realpath(srcdir)
 
         if sys.platform == 'darwin':
             kernel_version = os.uname().release  # Kernel version (8.4.3)
diff -r a970054a93fb Lib/test/test_sysconfig.py
--- a/Lib/test/test_sysconfig.py	Mon Jul 16 18:30:03 2012 +0100
+++ b/Lib/test/test_sysconfig.py	Mon Jul 16 23:50:59 2012 +0100
@@ -332,6 +332,31 @@
             self.assertEqual(status, 0)
             self.assertEqual(my_platform, test_platform)
 
+    def test_srcdir(self):
+        # See Issues #15322, #15364.
+        srcdir = sysconfig.get_config_var("srcdir")
+
+        self.assertTrue(os.path.isabs(srcdir), srcdir)
+        self.assertTrue(os.path.isdir(srcdir), srcdir)
+
+        if sysconfig._PYTHON_BUILD:
+            # The python executable is being run from a build
+            # directory, so srcdir should be a full source checkout.
+            Python_h = os.path.join(srcdir, 'Include', 'Python.h')
+            self.assertTrue(os.path.exists(Python_h), Python_h)
+
+    def test_srcdir_independent_of_cwd(self):
+        # srcdir should be independent of the current working directory
+        # See Issues #15322, #15364.
+        srcdir = sysconfig.get_config_var("srcdir")
+        cwd = os.getcwd()
+        try:
+            os.chdir('..')
+            srcdir2 = sysconfig.get_config_var("srcdir")
+        finally:
+            os.chdir(cwd)
+        self.assertEqual(srcdir, srcdir2)
+
 
 class MakefileTests(unittest.TestCase):