[Python-checkins] CVS: distutils/distutils/command build_ext.py,1.30,1.31

[Greg Ward]

Update of /projects/cvsroot/distutils/distutils/command
In directory kaluha:/tmp/cvs-serv27278

Modified Files:
	build_ext.py 
Log Message:
Use 'get_python_inc()' to figure out the Python include directories
rather than cobbling them togethere here.

Index: build_ext.py
===================================================================
RCS file: /projects/cvsroot/distutils/distutils/command/build_ext.py,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** build_ext.py	2000/04/10 00:19:42	1.30
--- build_ext.py	2000/04/14 00:50:49	1.31
***************
*** 7,11 ****
  # created 1999/08/09, Greg Ward
  
! __revision__ = "$Id: build_ext.py,v 1.30 2000/04/10 00:19:42 gward Exp $"
  
  import sys, os, string, re
--- 7,11 ----
  # created 1999/08/09, Greg Ward
  
! __revision__ = "$Id: build_ext.py,v 1.31 2000/04/14 00:50:49 gward Exp $"
  
  import sys, os, string, re
***************
*** 106,115 ****
  
          # Make sure Python's include directories (for Python.h, config.h,
!         # etc.) are in the include search path.  We have to roll our own
!         # "exec include dir", because the Makefile parsed by sysconfig
!         # doesn't have it (sigh).
!         py_include = sysconfig.INCLUDEPY # prefix + "include" + "python" + ver
!         exec_py_include = os.path.join (sysconfig.exec_prefix, 'include',
!                                         'python' + sys.version[0:3])
          if self.include_dirs is None:
              self.include_dirs = self.distribution.include_dirs or []
--- 106,112 ----
  
          # Make sure Python's include directories (for Python.h, config.h,
!         # etc.) are in the include search path.
!         py_include = sysconfig.get_python_inc()
!         plat_py_include = sysconfig.get_python_inc(plat_specific=1)
          if self.include_dirs is None:
              self.include_dirs = self.distribution.include_dirs or []
***************
*** 121,126 ****
          # any local include dirs take precedence.
          self.include_dirs.append (py_include)
!         if exec_py_include != py_include:
!             self.include_dirs.insert (0, exec_py_include)
  
          if type (self.libraries) is StringType:
--- 118,123 ----
          # any local include dirs take precedence.
          self.include_dirs.append (py_include)
!         if plat_py_include != py_include:
!             self.include_dirs.append (plat_py_include)
  
          if type (self.libraries) is StringType: