]>
Commit | Line | Data |
---|---|---|
73e32db0 JK |
1 | diff -dur Python-3.2.1.orig/Lib/distutils/command/install.py Python-3.2.1/Lib/distutils/command/install.py |
2 | --- Python-3.2.1.orig/Lib/distutils/command/install.py 2011-07-15 20:16:35.526223992 +0200 | |
3 | +++ Python-3.2.1/Lib/distutils/command/install.py 2011-07-15 20:17:09.131071575 +0200 | |
48e785bb JK |
4 | @@ -48,14 +48,14 @@ |
5 | ||
6 | INSTALL_SCHEMES = { | |
7 | 'unix_prefix': { | |
8 | - 'purelib': '$base/lib/python$py_version_short/site-packages', | |
9 | + 'purelib': '$base/share/python$py_version_short/site-packages', | |
10 | 'platlib': '$platbase/'+libname+'/python$py_version_short/site-packages', | |
11 | 'headers': '$base/include/python$py_version_short$abiflags/$dist_name', | |
12 | 'scripts': '$base/bin', | |
13 | 'data' : '$base', | |
14 | }, | |
15 | 'unix_home': { | |
16 | - 'purelib': '$base/lib/python', | |
17 | + 'purelib': '$base/share/python', | |
18 | 'platlib': '$base/'+libname+'/python', | |
19 | 'headers': '$base/include/python/$dist_name', | |
20 | 'scripts': '$base/bin', | |
73e32db0 JK |
21 | diff -dur Python-3.2.1.orig/Lib/distutils/sysconfig.py Python-3.2.1/Lib/distutils/sysconfig.py |
22 | --- Python-3.2.1.orig/Lib/distutils/sysconfig.py 2011-07-15 20:16:35.526223992 +0200 | |
23 | +++ Python-3.2.1/Lib/distutils/sysconfig.py 2011-07-15 20:17:09.131071575 +0200 | |
48e785bb JK |
24 | @@ -124,12 +124,12 @@ |
25 | prefix = plat_specific and EXEC_PREFIX or PREFIX | |
26 | ||
27 | if os.name == "posix": | |
28 | - if plat_specific: | |
29 | - lib = sys.lib | |
30 | + if plat_specific: | |
31 | + libpython = os.path.join(prefix, | |
32 | + sys.lib, "python" + get_python_version()) | |
33 | else: | |
34 | - lib = 'lib' | |
35 | - libpython = os.path.join(prefix, | |
36 | - lib, "python" + get_python_version()) | |
37 | + libpython = os.path.join(prefix, | |
38 | + "share", "python" + get_python_version()) | |
39 | if standard_lib: | |
40 | return libpython | |
41 | else: | |
73e32db0 JK |
42 | diff -dur Python-3.2.1.orig/Lib/distutils/tests/test_install.py Python-3.2.1/Lib/distutils/tests/test_install.py |
43 | --- Python-3.2.1.orig/Lib/distutils/tests/test_install.py 2011-07-15 20:16:35.529557475 +0200 | |
44 | +++ Python-3.2.1/Lib/distutils/tests/test_install.py 2011-07-15 20:17:09.131071575 +0200 | |
48e785bb JK |
45 | @@ -48,7 +48,7 @@ |
46 | expected = os.path.normpath(expected) | |
47 | self.assertEqual(got, expected) | |
48 | ||
49 | - libdir = os.path.join(destination, "lib", "python") | |
50 | + libdir = os.path.join(destination, "share", "python") | |
51 | platlibdir = os.path.join(destination, sys.lib, "python") | |
52 | check_path(cmd.install_lib, libdir) | |
53 | check_path(cmd.install_platlib, platlibdir) | |
73e32db0 JK |
54 | diff -dur Python-3.2.1.orig/Lib/site.py Python-3.2.1/Lib/site.py |
55 | --- Python-3.2.1.orig/Lib/site.py 2011-07-15 20:16:35.529557475 +0200 | |
56 | +++ Python-3.2.1/Lib/site.py 2011-07-15 20:17:09.134405059 +0200 | |
48e785bb JK |
57 | @@ -289,9 +289,8 @@ |
58 | "python" + sys.version[:3], | |
59 | "site-packages")) | |
60 | sitepackages.append(os.path.join(prefix, sys.lib, "site-python")) | |
61 | - if sys.lib != 'lib': | |
62 | - sitepackages.append(os.path.join(prefix, "lib", "python" + sys.version[:3], "site-packages")) | |
63 | - sitepackages.append(os.path.join(prefix, "lib", "site-python")) | |
64 | + sitepackages.append(os.path.join(prefix, "share", "python" + sys.version[:3], "site-packages")) | |
65 | + sitepackages.append(os.path.join(prefix, "share", "site-python")) | |
66 | else: | |
67 | sitepackages.append(prefix) | |
68 | sitepackages.append(os.path.join(prefix, sys.lib, "site-packages")) | |
73e32db0 JK |
69 | diff -dur Python-3.2.1.orig/Lib/sysconfig.py Python-3.2.1/Lib/sysconfig.py |
70 | --- Python-3.2.1.orig/Lib/sysconfig.py 2011-07-15 20:16:35.532890958 +0200 | |
71 | +++ Python-3.2.1/Lib/sysconfig.py 2011-07-15 20:18:27.267925241 +0200 | |
72 | @@ -23,7 +23,7 @@ | |
73 | 'posix_prefix': { | |
74 | 'stdlib': '{base}/' + sys.lib + '/python{py_version_short}', | |
75 | 'platstdlib': '{platbase}/' + sys.lib + '/python{py_version_short}', | |
76 | - 'purelib': '{base}/lib/python{py_version_short}/site-packages', | |
77 | + 'purelib': '{base}/share/python{py_version_short}/site-packages', | |
78 | 'platlib': '{platbase}/' + sys.lib + '/python{py_version_short}/site-packages', | |
79 | 'include': | |
80 | '{base}/include/python{py_version_short}{abiflags}', | |
81 | diff -dur Python-3.2.1.orig/Makefile.pre.in Python-3.2.1/Makefile.pre.in | |
82 | --- Python-3.2.1.orig/Makefile.pre.in 2011-07-15 20:16:35.532890958 +0200 | |
83 | +++ Python-3.2.1/Makefile.pre.in 2011-07-15 20:17:09.134405059 +0200 | |
48e785bb JK |
84 | @@ -108,7 +108,7 @@ |
85 | MANDIR= @mandir@ | |
86 | INCLUDEDIR= @includedir@ | |
87 | CONFINCLUDEDIR= $(exec_prefix)/include | |
88 | -SCRIPTDIR= $(prefix)/$(LIB) | |
89 | +SCRIPTDIR= $(prefix)/share | |
90 | ABIFLAGS= @ABIFLAGS@ | |
91 | ||
92 | # Detailed destination directories | |
93 | @@ -1046,7 +1046,7 @@ | |
94 | ||
95 | # Install the library and miscellaneous stuff needed for extending/embedding | |
96 | # This goes into $(exec_prefix) | |
97 | -LIBPL= $(LIBDEST)/config-$(LDVERSION) | |
98 | +LIBPL= $(BINLIBDEST)/config-$(LDVERSION) | |
99 | ||
100 | # pkgconfig directory | |
101 | LIBPC= $(LIBDIR)/pkgconfig | |
102 | @@ -1065,8 +1065,8 @@ | |
103 | if test "$(SO)" = .dll; then \ | |
104 | $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \ | |
105 | else \ | |
106 | - $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ | |
107 | - $(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ | |
108 | + $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBDIR)/$(LIBRARY) ; \ | |
109 | + $(RANLIB) $(DESTDIR)$(LIBDIR)/$(LIBRARY) ; \ | |
110 | fi; \ | |
111 | else \ | |
112 | echo Skip install of $(LIBRARY) - use make frameworkinstall; \ | |
73e32db0 JK |
113 | diff -dur Python-3.2.1.orig/Modules/getpath.c Python-3.2.1/Modules/getpath.c |
114 | --- Python-3.2.1.orig/Modules/getpath.c 2011-07-15 20:16:35.536224442 +0200 | |
115 | +++ Python-3.2.1/Modules/getpath.c 2011-07-15 20:17:09.137738543 +0200 | |
e3852288 | 116 | @@ -131,7 +131,8 @@ |
e684db95 AM |
117 | |
118 | #ifndef PYTHONPATH | |
119 | #define PYTHONPATH PREFIX "/" LIB_PYTHON VERSION ":" \ | |
120 | - EXEC_PREFIX "/" LIB_PYTHON VERSION "/lib-dynload:" | |
121 | + EXEC_PREFIX "/" LIB_PYTHON VERSION "/lib-dynload:" \ | |
122 | + PREFIX "/share/python" VERSION | |
123 | #endif | |
124 | ||
125 | #ifndef LANDMARK | |
48e785bb | 126 | @@ -143,7 +144,8 @@ |
f215c9da AF |
127 | static wchar_t progpath[MAXPATHLEN+1]; |
128 | static wchar_t *module_search_path = NULL; | |
48e785bb JK |
129 | static int module_search_path_malloced = 0; |
130 | -+static wchar_t *lib_python = LIB_PYTHON VERSION; | |
131 | +static wchar_t *lib_python = LIB_PYTHON VERSION; | |
f215c9da | 132 | +static wchar_t share_python[] = L"share/python" VERSION; |
e684db95 | 133 | |
e3852288 JB |
134 | static void |
135 | reduce(wchar_t *dir) | |
48e785bb | 136 | @@ -284,7 +286,7 @@ |
f215c9da | 137 | delim = wcschr(prefix, DELIM); |
e684db95 | 138 | if (delim) |
f215c9da | 139 | *delim = L'\0'; |
e684db95 AM |
140 | - joinpath(prefix, lib_python); |
141 | + joinpath(prefix, share_python); | |
142 | joinpath(prefix, LANDMARK); | |
143 | return 1; | |
144 | } | |
48e785bb | 145 | @@ -310,7 +312,7 @@ |
e3852288 | 146 | copy_absolute(prefix, argv0_path, MAXPATHLEN+1); |
e684db95 | 147 | do { |
f215c9da | 148 | n = wcslen(prefix); |
e684db95 AM |
149 | - joinpath(prefix, lib_python); |
150 | + joinpath(prefix, share_python); | |
151 | joinpath(prefix, LANDMARK); | |
152 | if (ismodule(prefix)) | |
153 | return 1; | |
48e785bb | 154 | @@ -320,7 +322,7 @@ |
e684db95 AM |
155 | |
156 | /* Look at configure's PREFIX */ | |
e3852288 | 157 | wcsncpy(prefix, _prefix, MAXPATHLEN); |
e684db95 AM |
158 | - joinpath(prefix, lib_python); |
159 | + joinpath(prefix, share_python); | |
160 | joinpath(prefix, LANDMARK); | |
161 | if (ismodule(prefix)) | |
162 | return 1; | |
48e785bb | 163 | @@ -578,7 +580,7 @@ |
e684db95 AM |
164 | fprintf(stderr, |
165 | "Could not find platform independent libraries <prefix>\n"); | |
e3852288 | 166 | wcsncpy(prefix, _prefix, MAXPATHLEN); |
e684db95 AM |
167 | - joinpath(prefix, lib_python); |
168 | + joinpath(prefix, share_python); | |
169 | } | |
170 | else | |
171 | reduce(prefix); | |
48e785bb | 172 | @@ -591,7 +593,7 @@ |
e684db95 AM |
173 | } |
174 | else | |
e3852288 | 175 | wcsncpy(zip_path, _prefix, MAXPATHLEN); |
f215c9da | 176 | - joinpath(zip_path, L"lib/python00.zip"); |
e684db95 | 177 | + joinpath(zip_path, LIB_PYTHON "00.zip"); |
e3852288 | 178 | bufsz = wcslen(zip_path); /* Replace "00" with version */ |
e684db95 AM |
179 | zip_path[bufsz - 6] = VERSION[0]; |
180 | zip_path[bufsz - 5] = VERSION[2]; |