diff options
| author | Barry Warsaw <barry@python.org> | 2010-11-24 19:43:47 (GMT) |
|---|---|---|
| committer | Barry Warsaw <barry@python.org> | 2010-11-24 19:43:47 (GMT) |
| commit | 14d98ac31b9f4e5b89284271f03fb77fc81ab624 (patch) | |
| tree | 2f784cc5d4b814b41c4d14f2f308e1173c938e58 /Lib/sysconfig.py | |
| parent | fdba067213f1881632f9f1b7b4fce53cf88bbe28 (diff) | |
| download | cpython-14d98ac31b9f4e5b89284271f03fb77fc81ab624.zip cpython-14d98ac31b9f4e5b89284271f03fb77fc81ab624.tar.gz cpython-14d98ac31b9f4e5b89284271f03fb77fc81ab624.tar.bz2 | |
Final patch for issue 9807.
Diffstat (limited to 'Lib/sysconfig.py')
| -rw-r--r-- | Lib/sysconfig.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py index 52efdb0..fe8c990 100644 --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py @@ -25,8 +25,10 @@ _INSTALL_SCHEMES = { 'platstdlib': '{platbase}/lib/python{py_version_short}', 'purelib': '{base}/lib/python{py_version_short}/site-packages', 'platlib': '{platbase}/lib/python{py_version_short}/site-packages', - 'include': '{base}/include/python{py_version_short}', - 'platinclude': '{platbase}/include/python{py_version_short}', + 'include': + '{base}/include/python{py_version_short}{abiflags}', + 'platinclude': + '{platbase}/include/python{py_version_short}{abiflags}', 'scripts': '{base}/bin', 'data': '{base}', }, @@ -317,7 +319,9 @@ def get_makefile_filename(): """Return the path of the Makefile.""" if _PYTHON_BUILD: return os.path.join(_PROJECT_BASE, "Makefile") - return os.path.join(get_path('stdlib'), "config", "Makefile") + return os.path.join(get_path('stdlib'), + 'config-{}{}'.format(_PY_VERSION_SHORT, sys.abiflags), + 'Makefile') def _init_posix(vars): @@ -471,6 +475,7 @@ def get_config_vars(*args): _CONFIG_VARS['base'] = _PREFIX _CONFIG_VARS['platbase'] = _EXEC_PREFIX _CONFIG_VARS['projectbase'] = _PROJECT_BASE + _CONFIG_VARS['abiflags'] = sys.abiflags if os.name in ('nt', 'os2'): _init_non_posix(_CONFIG_VARS) |