Compute expat -I directives from srcdir. Fixes #517214.

diff --git a/setup.py b/setup.py
index d928775dc8e5a6a02b57947935676a3a604e81cd..e9758e31ac80a851df1d5acd4f38dbe904b4f855 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -224,6 +224,7 @@ class PyBuildExt(build_ext):
         exts = []
 
         platform = self.get_platform()
+        (srcdir,) = sysconfig.get_config_vars('srcdir')
 
         # Check for MacOS X, which doesn't need libm.a at all
         math_libs = ['m']
@@ -558,6 +559,7 @@ class PyBuildExt(build_ext):
             xmlbo = "12"
         else:
             xmlbo = "21"
+        expatinc = os.path.join(os.getcwd(), srcdir, 'Modules', 'expat')
         exts.append(Extension('pyexpat',
                               sources = [
             'pyexpat.c',
@@ -572,7 +574,7 @@ class PyBuildExt(build_ext):
             ('XML_BYTE_ORDER', xmlbo),
             ('XML_CONTEXT_BYTES','1024'),
             ],
-                              include_dirs = ['Modules/expat']
+                              include_dirs = [expatinc]
                                ))                        
 
         # Dynamic loading module