| diff -urN a/configure.in b/configure.in |
| --- a/configure.in 2012-06-30 12:58:46.040253992 +0100 |
| +++ b/configure.in 2012-06-30 12:59:01.148368383 +0100 |
| @@ -86,8 +86,8 @@ |
| AC_SUBST(VERSION) |
| case $host in |
| *-*-mingw*) |
| - dnl To be compatible with MSVC build. |
| -VERSION=`echo PYTHON_VERSION | sed -e 's|\.||g'` |
| + dnl To be *incompatible* with MSVC build! |
| +VERSION=PYTHON_VERSION |
| ;; |
| *) |
| VERSION=PYTHON_VERSION |
| diff -urN a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py |
| --- a/Lib/distutils/sysconfig.py 2012-06-30 12:58:46.010253764 +0100 |
| +++ b/Lib/distutils/sysconfig.py 2012-06-30 13:06:42.525821215 +0100 |
| @@ -115,7 +115,7 @@ |
| if prefix is None: |
| prefix = plat_specific and EXEC_PREFIX or PREFIX |
| |
| - if os.name == "posix": |
| + if os.name == "posix" or sys.version.find('GCC') >= 0: |
| libpython = os.path.join(prefix, |
| "lib", "python" + get_python_version()) |
| if standard_lib: |
| diff -urN a/Lib/sysconfig.py b/Lib/sysconfig.py |
| --- a/Lib/sysconfig.py 2012-06-30 12:58:46.013253788 +0100 |
| +++ b/Lib/sysconfig.py 2012-06-30 12:59:01.150368397 +0100 |
| @@ -35,13 +35,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': { |
| @@ -64,12 +64,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': { |
| @@ -319,7 +319,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(abspath(sys.executable)) |
| |
| # |
