[pypy-svn] r75421 - in pypy/branch/sys-prefix/lib/pypy1.2/lib-python/modified-2.5.2/distutils: . command

[antocuni at codespeak.net]

Author: antocuni
Date: Wed Jun 16 14:45:28 2010
New Revision: 75421

Modified:
   pypy/branch/sys-prefix/lib/pypy1.2/lib-python/modified-2.5.2/distutils/cmd.py
   pypy/branch/sys-prefix/lib/pypy1.2/lib-python/modified-2.5.2/distutils/command/install.py
   pypy/branch/sys-prefix/lib/pypy1.2/lib-python/modified-2.5.2/distutils/sysconfig_pypy.py
Log:
move the default location of site-packages to
$PREFIX/lib/pypy1.2/site-packages, instead of $PREFIX/site-packages



Modified: pypy/branch/sys-prefix/lib/pypy1.2/lib-python/modified-2.5.2/distutils/cmd.py
==============================================================================
--- pypy/branch/sys-prefix/lib/pypy1.2/lib-python/modified-2.5.2/distutils/cmd.py	(original)
+++ pypy/branch/sys-prefix/lib/pypy1.2/lib-python/modified-2.5.2/distutils/cmd.py	Wed Jun 16 14:45:28 2010
@@ -18,7 +18,8 @@
     # return a list of 'site' dirs for easy_install
     from pkg_resources import normalize_path
     sitedirs = filter(None,os.environ.get('PYTHONPATH','').split(os.pathsep))
-    sitedirs.append(os.path.join(sys.pypy_prefix, 'site-packages'))
+    pypylib = 'pypy%d.%d' % sys.pypy_version_info[:2]
+    sitedirs.append(os.path.join(sys.prefix, 'lib', pypylib, 'site-packages'))
     sitedirs = map(normalize_path, sitedirs)
     return sitedirs
 

Modified: pypy/branch/sys-prefix/lib/pypy1.2/lib-python/modified-2.5.2/distutils/command/install.py
==============================================================================
--- pypy/branch/sys-prefix/lib/pypy1.2/lib-python/modified-2.5.2/distutils/command/install.py	(original)
+++ pypy/branch/sys-prefix/lib/pypy1.2/lib-python/modified-2.5.2/distutils/command/install.py	Wed Jun 16 14:45:28 2010
@@ -67,8 +67,8 @@
         'data'   : '$base',
         },
     'pypy': {
-        'purelib': '$base/site-packages',
-        'platlib': '$base/site-packages',
+        'purelib': '$base/lib/pypy$pypy_version_short/site-packages',
+        'platlib': '$base/lib/pypy$pypy_version_short/site-packages',
         'headers': '$base/include',
         'scripts': '$base/bin',
         'data'   : '$base',
@@ -283,6 +283,7 @@
                             'dist_fullname': self.distribution.get_fullname(),
                             'py_version': py_version,
                             'py_version_short': py_version[0:3],
+                            'pypy_version_short': '%d.%d' % sys.pypy_version_info[:2],
                             'sys_prefix': prefix,
                             'prefix': prefix,
                             'sys_exec_prefix': exec_prefix,

Modified: pypy/branch/sys-prefix/lib/pypy1.2/lib-python/modified-2.5.2/distutils/sysconfig_pypy.py
==============================================================================
--- pypy/branch/sys-prefix/lib/pypy1.2/lib-python/modified-2.5.2/distutils/sysconfig_pypy.py	(original)
+++ pypy/branch/sys-prefix/lib/pypy1.2/lib-python/modified-2.5.2/distutils/sysconfig_pypy.py	Wed Jun 16 14:45:28 2010
@@ -44,7 +44,8 @@
             "calls to get_python_lib(standard_lib=1) cannot succeed")
     if prefix is None:
         prefix = PYPY_PREFIX
-    return os.path.join(prefix, "site-packages")
+    pypylib = 'pypy%d.%d' % sys.pypy_version_info[:2]
+    return os.path.join(prefix, 'lib', pypylib, 'site-packages')
 
 
 _config_vars = None