[Python-checkins] CVS: distutils/distutils/command build.py,1.26,1.27

Greg Ward python-dev@python.org
Fri, 15 Sep 2000 19:06:48 -0700


Update of /cvsroot/python/distutils/distutils/command
In directory slayer.i.sourceforge.net:/tmp/cvs-serv10243/distutils/command

Modified Files:
	build.py 
Log Message:
Tweaked the build temp dir names again.

Index: build.py
===================================================================
RCS file: /cvsroot/python/distutils/distutils/command/build.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** build.py	2000/09/16 01:54:46	1.26
--- build.py	2000/09/16 02:06:45	1.27
***************
*** 63,73 ****
      def finalize_options (self):
  
!         # Need this to name platform-specific directories, but sys.platform
!         # is not enough -- it only names the OS and version, not the
!         # hardware architecture!
!         self.plat = get_platform ()
  
-         plat_specifier = sys.version[0:3] + '-' + self.plat
- 
          # 'build_purelib' and 'build_platlib' just default to 'lib' and
          # 'lib.<plat>' under the base build directory.  We only use one of
--- 63,68 ----
      def finalize_options (self):
  
!         plat_specifier = ".%s-%s" % (get_platform(), sys.version[0:3])
  
          # 'build_purelib' and 'build_platlib' just default to 'lib' and
          # 'lib.<plat>' under the base build directory.  We only use one of
***************
*** 77,81 ****
          if self.build_platlib is None:
              self.build_platlib = os.path.join (self.build_base,
!                                                'lib-' + plat_specifier)
  
          # 'build_lib' is the actual directory that we will use for this
--- 72,76 ----
          if self.build_platlib is None:
              self.build_platlib = os.path.join (self.build_base,
!                                                'lib' + plat_specifier)
  
          # 'build_lib' is the actual directory that we will use for this
***************
*** 92,98 ****
          if self.build_temp is None:
              self.build_temp = os.path.join (self.build_base,
!                                             'temp-' + plat_specifier)
          if self.build_scripts is None:
              self.build_scripts = os.path.join (self.build_base, 'scripts')
      # finalize_options ()
  
--- 87,94 ----
          if self.build_temp is None:
              self.build_temp = os.path.join (self.build_base,
!                                             'temp' + plat_specifier)
          if self.build_scripts is None:
              self.build_scripts = os.path.join (self.build_base, 'scripts')
+ 
      # finalize_options ()