68 lines
3.1 KiB
Diff
68 lines
3.1 KiB
Diff
diff -urN a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py
|
|
--- a/Lib/distutils/command/build_ext.py 2013-12-26 18:48:09.705270800 +0000
|
|
+++ b/Lib/distutils/command/build_ext.py 2013-12-26 18:48:14.253530900 +0000
|
|
@@ -240,9 +240,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 -urN a/Lib/sysconfig.py b/Lib/sysconfig.py
|
|
--- a/Lib/sysconfig.py 2013-12-26 18:48:10.012288300 +0000
|
|
+++ b/Lib/sysconfig.py 2013-12-26 18:48:14.256531100 +0000
|
|
@@ -43,13 +43,13 @@
|
|
'data': '{base}',
|
|
},
|
|
'nt': {
|
|
- 'stdlib': '{installed_base}/Lib',
|
|
- 'platstdlib': '{base}/Lib',
|
|
- 'purelib': '{base}/Lib/site-packages',
|
|
- 'platlib': '{base}/Lib/site-packages',
|
|
- 'include': '{installed_base}/Include',
|
|
- 'platinclude': '{installed_base}/Include',
|
|
- 'scripts': '{base}/Scripts',
|
|
+ 'stdlib': '{installed_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': '{installed_base}/include/python{py_version_short}',
|
|
+ 'platinclude': '{installed_base}/include/python{py_version_short}',
|
|
+ 'scripts': '{base}/bin',
|
|
'data': '{base}',
|
|
},
|
|
'os2': {
|
|
@@ -72,12 +72,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': {
|
|
@@ -450,7 +450,7 @@
|
|
vars['SO'] = '.pyd'
|
|
vars['EXT_SUFFIX'] = '.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))
|
|
|
|
#
|