[Python-checkins] r69315 - python/trunk/setup.py

neil.schemenauer python-checkins at python.org
Thu Feb 5 23:14:04 CET 2009


Author: neil.schemenauer
Date: Thu Feb  5 23:14:04 2009
New Revision: 69315

Log:
Oops, Mac build needs the 'incdirlist' variable so restore it.


Modified:
   python/trunk/setup.py

Modified: python/trunk/setup.py
==============================================================================
--- python/trunk/setup.py	(original)
+++ python/trunk/setup.py	Thu Feb  5 23:14:04 2009
@@ -122,13 +122,14 @@
         moddirlist = [os.path.join(srcdir, 'Modules')]
 
         # Platform-dependent module source and include directories
+        incdirlist = []
         platform = self.get_platform()
         if platform in ('darwin', 'mac') and ("--disable-toolbox-glue" not in
             sysconfig.get_config_var("CONFIG_ARGS")):
             # Mac OS X also includes some mac-specific modules
             macmoddir = os.path.join(srcdir, 'Mac/Modules')
             moddirlist.append(macmoddir)
-            incdirlist.append('./Mac/Include')
+            incdirlist.append(os.path.join(srcdir, 'Mac/Include'))
 
         # Fix up the paths for scripts, too
         self.distribution.scripts = [os.path.join(srcdir, filename)
@@ -148,6 +149,9 @@
             # re-compile extensions if a header file has been changed
             ext.depends.extend(headers)
 
+            # platform specific include directories
+            ext.include_dirs.extend(incdirlist)
+
             # If a module has already been built statically,
             # don't build it here
             if ext.name in sys.builtin_module_names:


More information about the Python-checkins mailing list