[Python-checkins] CVS: python/dist/src setup.py,1.38,1.39

A.M. Kuchling akuchling@users.sourceforge.net
Mon, 21 May 2001 13:29:30 -0700


Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv6451

Modified Files:
	setup.py 
Log Message:
Fix bug #232619: fix misleading warning on installing to lib-dynload


Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/setup.py,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** setup.py	2001/04/15 15:16:12	1.38
--- setup.py	2001/05/21 20:29:27	1.39
***************
*** 13,16 ****
--- 13,17 ----
  from distutils.core import Extension, setup
  from distutils.command.build_ext import build_ext
+ from distutils.command.install import install
  
  # This global variable is used to hold the list of modules to be disabled.
***************
*** 599,606 ****
          #       -lGL -lGLU -lXext -lXmu \
  
  def main():
      setup(name = 'Python standard library',
            version = '%d.%d' % sys.version_info[:2],
!           cmdclass = {'build_ext':PyBuildExt},
            # The struct module is defined here, because build_ext won't be
            # called unless there's at least one extension module defined.
--- 600,615 ----
          #       -lGL -lGLU -lXext -lXmu \
  
+ class PyBuildInstall(install):
+     # Suppress the warning about installation into the lib_dynload
+     # directory, which is not in sys.path when running Python during
+     # installation:
+     def initialize_options (self):
+         install.initialize_options(self)
+         self.warn_dir=0
+     
  def main():
      setup(name = 'Python standard library',
            version = '%d.%d' % sys.version_info[:2],
!           cmdclass = {'build_ext':PyBuildExt, 'install':PyBuildInstall},
            # The struct module is defined here, because build_ext won't be
            # called unless there's at least one extension module defined.