68 lines
3.2 KiB
Diff
68 lines
3.2 KiB
Diff
diff -Naur Python-2.7.9-orig/Lib/distutils/command/build_ext.py Python-2.7.9/Lib/distutils/command/build_ext.py
|
|
--- Python-2.7.9-orig/Lib/distutils/command/build_ext.py 2014-12-11 13:50:16.614200000 +0300
|
|
+++ Python-2.7.9/Lib/distutils/command/build_ext.py 2014-12-11 13:50:51.121400000 +0300
|
|
@@ -224,9 +224,10 @@
|
|
if sys.platform[:6] == 'cygwin' or sys.platform[:6] == 'atheos':
|
|
if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
|
|
# building third party extensions
|
|
+ config_dir_name = os.path.basename(sysconfig.get_config_var('LIBPL'))
|
|
self.library_dirs.append(os.path.join(sys.prefix, "lib",
|
|
"python" + get_python_version(),
|
|
- "config"))
|
|
+ config_dir_name))
|
|
else:
|
|
# building python standard extensions
|
|
self.library_dirs.append('.')
|
|
diff -Naur Python-2.7.9-orig/Lib/sysconfig.py Python-2.7.9/Lib/sysconfig.py
|
|
--- Python-2.7.9-orig/Lib/sysconfig.py 2014-12-11 13:50:51.012200000 +0300
|
|
+++ Python-2.7.9/Lib/sysconfig.py 2014-12-11 13:50:51.121400000 +0300
|
|
@@ -27,13 +27,13 @@
|
|
'data' : '{base}',
|
|
},
|
|
'nt': {
|
|
- 'stdlib': '{base}/Lib',
|
|
- 'platstdlib': '{base}/Lib',
|
|
- 'purelib': '{base}/Lib/site-packages',
|
|
- 'platlib': '{base}/Lib/site-packages',
|
|
- 'include': '{base}/Include',
|
|
- 'platinclude': '{base}/Include',
|
|
- 'scripts': '{base}/Scripts',
|
|
+ 'stdlib': '{base}/lib/python{py_version_short}',
|
|
+ 'platstdlib': '{base}/lib/python{py_version_short}',
|
|
+ 'purelib': '{base}/lib/python{py_version_short}',
|
|
+ 'platlib': '{base}/lib/python{py_version_short}',
|
|
+ 'include': '{base}/include/python{py_version_short}',
|
|
+ 'platinclude': '{base}/include/python{py_version_short}',
|
|
+ 'scripts': '{base}/bin',
|
|
'data' : '{base}',
|
|
},
|
|
'os2': {
|
|
@@ -56,12 +56,12 @@
|
|
'data' : '{userbase}',
|
|
},
|
|
'nt_user': {
|
|
- 'stdlib': '{userbase}/Python{py_version_nodot}',
|
|
- 'platstdlib': '{userbase}/Python{py_version_nodot}',
|
|
- 'purelib': '{userbase}/Python{py_version_nodot}/site-packages',
|
|
- 'platlib': '{userbase}/Python{py_version_nodot}/site-packages',
|
|
- 'include': '{userbase}/Python{py_version_nodot}/Include',
|
|
- 'scripts': '{userbase}/Scripts',
|
|
+ 'stdlib': '{userbase}/lib/python{py_version_short}',
|
|
+ 'platstdlib': '{userbase}/lib/python{py_version_short}',
|
|
+ 'purelib': '{userbase}/lib/python{py_version_short}',
|
|
+ 'platlib': '{userbase}/lib/python{py_version_short}',
|
|
+ 'include': '{userbase}/include/python{py_version_short}',
|
|
+ 'scripts': '{userbase}/bin',
|
|
'data' : '{userbase}',
|
|
},
|
|
'posix_user': {
|
|
@@ -390,7 +390,7 @@
|
|
vars['INCLUDEPY'] = get_path('include')
|
|
vars['SO'] = '.pyd'
|
|
vars['EXE'] = '.exe'
|
|
- vars['VERSION'] = _PY_VERSION_SHORT_NO_DOT
|
|
+ vars['VERSION'] = _PY_VERSION_SHORT
|
|
vars['BINDIR'] = os.path.dirname(_safe_realpath(sys.executable))
|
|
|
|
#
|