|
48 | 48 | 'data': '{base}',
|
49 | 49 | },
|
50 | 50 | 'nt': {
|
51 |
| - 'stdlib': '{installed_base}/Lib', |
52 |
| - 'platstdlib': '{base}/Lib', |
53 |
| - 'purelib': '{base}/Lib/site-packages', |
54 |
| - 'platlib': '{base}/Lib/site-packages', |
55 |
| - 'include': '{installed_base}/Include', |
56 |
| - 'platinclude': '{installed_base}/Include', |
57 |
| - 'scripts': '{base}/Scripts', |
| 51 | + 'stdlib': '{installed_base}/lib/python{py_version_short}', |
| 52 | + 'platstdlib': '{base}/lib/python{py_version_short}', |
| 53 | + 'purelib': '{base}/lib/python{py_version_short}/site-packages', |
| 54 | + 'platlib': '{base}/lib/python{py_version_short}/site-packages', |
| 55 | + 'include': '{installed_base}/include/python{py_version_short}', |
| 56 | + 'platinclude': '{installed_base}/include/python{py_version_short}', |
| 57 | + 'scripts': '{base}/bin', |
58 | 58 | 'data': '{base}',
|
59 | 59 | },
|
60 | 60 | # Downstream distributors can overwrite the default install scheme.
|
@@ -140,12 +140,12 @@ def joinuser(*args):
|
140 | 140 | _INSTALL_SCHEMES |= {
|
141 | 141 | # NOTE: When modifying "purelib" scheme, update site._get_path() too.
|
142 | 142 | 'nt_user': {
|
143 |
| - 'stdlib': '{userbase}/Python{py_version_nodot_plat}', |
144 |
| - 'platstdlib': '{userbase}/Python{py_version_nodot_plat}', |
145 |
| - 'purelib': '{userbase}/Python{py_version_nodot_plat}/site-packages', |
146 |
| - 'platlib': '{userbase}/Python{py_version_nodot_plat}/site-packages', |
147 |
| - 'include': '{userbase}/Python{py_version_nodot_plat}/Include', |
148 |
| - 'scripts': '{userbase}/Python{py_version_nodot_plat}/Scripts', |
| 143 | + 'stdlib': '{userbase}/lib/python{py_version_short}', |
| 144 | + 'platstdlib': '{userbase}/lib/python{py_version_short}', |
| 145 | + 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', |
| 146 | + 'platlib': '{userbase}/lib/python{py_version_short}/site-packages', |
| 147 | + 'include': '{userbase}/include/python{py_version_short}', |
| 148 | + 'scripts': '{userbase}/bin', |
149 | 149 | 'data': '{userbase}',
|
150 | 150 | },
|
151 | 151 | 'posix_user': {
|
@@ -574,7 +574,7 @@ def _init_non_posix(vars):
|
574 | 574 | vars['INCLUDEPY'] = get_path('include')
|
575 | 575 | vars['EXT_SUFFIX'] = _imp.extension_suffixes()[0]
|
576 | 576 | vars['EXE'] = '.exe'
|
577 |
| - vars['VERSION'] = _PY_VERSION_SHORT_NO_DOT |
| 577 | + vars['VERSION'] = _PY_VERSION_SHORT |
578 | 578 | vars['BINDIR'] = os.path.dirname(_safe_realpath(sys.executable))
|
579 | 579 | vars['TZPATH'] = ''
|
580 | 580 |
|
|
0 commit comments