[Python-checkins] CVS: distutils/distutils/command install.py,1.43,1.44

[Greg Ward]

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

Modified Files:
	install.py 
Log Message:
Adjust to the new sysconfig regime: use 'get_config_vars()' instead
  of globals from sysconfig.
Added 'prefix' and 'exec_prefix' to the list of variables that can be
  expanded in installation directories (preserving the stupid old names
  of 'sys_prefix' and 'sys_exec_prefix, though).

Index: install.py
===================================================================
RCS file: /cvsroot/python/distutils/distutils/command/install.py,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -r1.43 -r1.44
*** install.py	2000/09/13 01:02:25	1.43
--- install.py	2000/09/15 01:20:10	1.44
***************
*** 10,14 ****
  from types import *
  from distutils.core import Command, DEBUG
! from distutils import sysconfig
  from distutils.file_util import write_file
  from distutils.util import convert_path, subst_vars, change_root
--- 10,14 ----
  from types import *
  from distutils.core import Command, DEBUG
! from distutils.sysconfig import get_config_vars
  from distutils.file_util import write_file
  from distutils.util import convert_path, subst_vars, change_root
***************
*** 227,230 ****
--- 227,231 ----
  
          py_version = (string.split(sys.version))[0]
+         prefix = get_config_vars('prefix', 'exec_prefix')
          self.config_vars = {'dist_name': self.distribution.get_name(),
                              'dist_version': self.distribution.get_version(),
***************
*** 232,237 ****
                              'py_version': py_version,
                              'py_version_short': py_version[0:3],
!                             'sys_prefix': sysconfig.PREFIX,
!                             'sys_exec_prefix': sysconfig.EXEC_PREFIX,
                             }
          self.expand_basedirs ()
--- 233,240 ----
                              'py_version': py_version,
                              'py_version_short': py_version[0:3],
!                             'sys_prefix': prefix,
!                             'prefix': prefix,
!                             'sys_exec_prefix': exec_prefix,
!                             'exec_prefix': exec_prefix,
                             }
          self.expand_basedirs ()