[Python-checkins] CVS: distutils/distutils/command install.py,1.57,1.58

[Greg Ward]

Update of /cvsroot/python/distutils/distutils/command
In directory usw-pr-cvs1:/tmp/cvs-serv20084/command

Modified Files:
	install.py 
Log Message:
Patch #449054 to implement PEP 250.  The standard install directory for
modules and extensions on Windows is now $PREFIX/Lib/site-packages.
Includes backwards compatibility code for pre-2.2 Pythons.  Contributed
by Paul Moore.


Index: install.py
===================================================================
RCS file: /cvsroot/python/distutils/distutils/command/install.py,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** install.py	2001/08/10 18:59:59	1.57
--- install.py	2001/08/23 20:53:27	1.58
***************
*** 17,20 ****
--- 17,37 ----
  from glob import glob
  
+ if sys.version < "2.2":
+     WINDOWS_SCHEME = {
+         'purelib': '$base',
+         'platlib': '$base',
+         'headers': '$base/Include/$dist_name',
+         'scripts': '$base/Scripts',
+         'data'   : '$base',
+     }
+ else:
+     WINDOWS_SCHEME = {
+         'purelib': '$base/Lib/site-packages',
+         'platlib': '$base/Lib/site-packages',
+         'headers': '$base/Include/$dist_name',
+         'scripts': '$base/Scripts',
+         'data'   : '$base',
+     }
+ 
  INSTALL_SCHEMES = {
      'unix_prefix': {
***************
*** 31,42 ****
          'scripts': '$base/bin',
          'data'   : '$base',
-         },
-     'nt': {
-         'purelib': '$base',
-         'platlib': '$base',
-         'headers': '$base/Include/$dist_name',
-         'scripts': '$base/Scripts',
-         'data'   : '$base',
          },
      'mac': {
          'purelib': '$base/Lib/site-packages',
--- 48,53 ----
          'scripts': '$base/bin',
          'data'   : '$base',
          },
+     'nt': WINDOWS_SCHEME,
      'mac': {
          'purelib': '$base/Lib/site-packages',