[Python-checkins] CVS: distutils/distutils/command bdist_wininst.py,1.13,1.14

Greg Ward python-dev@python.org
Thu, 21 Sep 2000 18:32:37 -0700


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

Modified Files:
	bdist_wininst.py 
Log Message:
Tweak what happens when run on non-Windows platforms: set install prefix 
as well as scheme, and don't convert all installation paths (that's now
done by the "install" command for us).

Index: bdist_wininst.py
===================================================================
RCS file: /cvsroot/python/distutils/distutils/command/bdist_wininst.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** bdist_wininst.py	2000/09/19 11:10:23	1.13
--- bdist_wininst.py	2000/09/22 01:32:34	1.14
***************
*** 76,89 ****
          install.root = self.bdist_dir
          if os.name != 'nt':
!             # must force install to use the 'nt' scheme
!             install.select_scheme ('nt')
!             # change the backslash to the current pathname separator
!             for key in ('purelib', 'platlib', 'headers', 'scripts',
!                         'data'):
!                 attrname = 'install_' + key
!                 attr = getattr (install, attrname)
!                 if attr:
!                     attr = string.replace (attr, '\\', os.sep)
!                     setattr (install, attrname, attr)
  
          install_lib = self.reinitialize_command('install_lib')
--- 76,84 ----
          install.root = self.bdist_dir
          if os.name != 'nt':
!             # Must force install to use the 'nt' scheme; we set the
!             # prefix too just because it looks silly to put stuff
!             # in (eg.) ".../usr/Scripts", "usr/Include", etc.
!             install.prefix = "Python"
!             install.select_scheme('nt')
  
          install_lib = self.reinitialize_command('install_lib')