---- Python-3.2/Modules/getpath.c.orig 2011-04-02 08:25:12.289739787 +0200
-+++ Python-3.2/Modules/getpath.c 2011-04-02 08:31:24.349729730 +0200
+diff -dur Python-3.2.1.orig/Lib/distutils/command/install.py Python-3.2.1/Lib/distutils/command/install.py
+--- Python-3.2.1.orig/Lib/distutils/command/install.py 2011-07-15 20:16:35.526223992 +0200
++++ Python-3.2.1/Lib/distutils/command/install.py 2011-07-15 20:17:09.131071575 +0200
+@@ -48,14 +48,14 @@
+
+ INSTALL_SCHEMES = {
+ 'unix_prefix': {
+- 'purelib': '$base/lib/python$py_version_short/site-packages',
++ 'purelib': '$base/share/python$py_version_short/site-packages',
+ 'platlib': '$platbase/'+libname+'/python$py_version_short/site-packages',
+ 'headers': '$base/include/python$py_version_short$abiflags/$dist_name',
+ 'scripts': '$base/bin',
+ 'data' : '$base',
+ },
+ 'unix_home': {
+- 'purelib': '$base/lib/python',
++ 'purelib': '$base/share/python',
+ 'platlib': '$base/'+libname+'/python',
+ 'headers': '$base/include/python/$dist_name',
+ 'scripts': '$base/bin',
+diff -dur Python-3.2.1.orig/Lib/distutils/sysconfig.py Python-3.2.1/Lib/distutils/sysconfig.py
+--- Python-3.2.1.orig/Lib/distutils/sysconfig.py 2011-07-15 20:16:35.526223992 +0200
++++ Python-3.2.1/Lib/distutils/sysconfig.py 2011-07-15 20:17:09.131071575 +0200
+@@ -124,12 +124,12 @@
+ prefix = plat_specific and EXEC_PREFIX or PREFIX
+
+ if os.name == "posix":
+- if plat_specific:
+- lib = sys.lib
++ if plat_specific:
++ libpython = os.path.join(prefix,
++ sys.lib, "python" + get_python_version())
+ else:
+- lib = 'lib'
+- libpython = os.path.join(prefix,
+- lib, "python" + get_python_version())
++ libpython = os.path.join(prefix,
++ "share", "python" + get_python_version())
+ if standard_lib:
+ return libpython
+ else:
+diff -dur Python-3.2.1.orig/Lib/distutils/tests/test_install.py Python-3.2.1/Lib/distutils/tests/test_install.py
+--- Python-3.2.1.orig/Lib/distutils/tests/test_install.py 2011-07-15 20:16:35.529557475 +0200
++++ Python-3.2.1/Lib/distutils/tests/test_install.py 2011-07-15 20:17:09.131071575 +0200
+@@ -48,7 +48,7 @@
+ expected = os.path.normpath(expected)
+ self.assertEqual(got, expected)
+
+- libdir = os.path.join(destination, "lib", "python")
++ libdir = os.path.join(destination, "share", "python")
+ platlibdir = os.path.join(destination, sys.lib, "python")
+ check_path(cmd.install_lib, libdir)
+ check_path(cmd.install_platlib, platlibdir)
+diff -dur Python-3.2.1.orig/Lib/site.py Python-3.2.1/Lib/site.py
+--- Python-3.2.1.orig/Lib/site.py 2011-07-15 20:16:35.529557475 +0200
++++ Python-3.2.1/Lib/site.py 2011-07-15 20:17:09.134405059 +0200
+@@ -289,9 +289,8 @@
+ "python" + sys.version[:3],
+ "site-packages"))
+ sitepackages.append(os.path.join(prefix, sys.lib, "site-python"))
+- if sys.lib != 'lib':
+- sitepackages.append(os.path.join(prefix, "lib", "python" + sys.version[:3], "site-packages"))
+- sitepackages.append(os.path.join(prefix, "lib", "site-python"))
++ sitepackages.append(os.path.join(prefix, "share", "python" + sys.version[:3], "site-packages"))
++ sitepackages.append(os.path.join(prefix, "share", "site-python"))
+ else:
+ sitepackages.append(prefix)
+ sitepackages.append(os.path.join(prefix, sys.lib, "site-packages"))
+diff -dur Python-3.2.1.orig/Lib/sysconfig.py Python-3.2.1/Lib/sysconfig.py
+--- Python-3.2.1.orig/Lib/sysconfig.py 2011-07-15 20:16:35.532890958 +0200
++++ Python-3.2.1/Lib/sysconfig.py 2011-07-15 20:18:27.267925241 +0200
+@@ -23,7 +23,7 @@
+ 'posix_prefix': {
+ 'stdlib': '{base}/' + sys.lib + '/python{py_version_short}',
+ 'platstdlib': '{platbase}/' + sys.lib + '/python{py_version_short}',
+- 'purelib': '{base}/lib/python{py_version_short}/site-packages',
++ 'purelib': '{base}/share/python{py_version_short}/site-packages',
+ 'platlib': '{platbase}/' + sys.lib + '/python{py_version_short}/site-packages',
+ 'include':
+ '{base}/include/python{py_version_short}{abiflags}',
+diff -dur Python-3.2.1.orig/Makefile.pre.in Python-3.2.1/Makefile.pre.in
+--- Python-3.2.1.orig/Makefile.pre.in 2011-07-15 20:16:35.532890958 +0200
++++ Python-3.2.1/Makefile.pre.in 2011-07-15 20:17:09.134405059 +0200
+@@ -108,7 +108,7 @@
+ MANDIR= @mandir@
+ INCLUDEDIR= @includedir@
+ CONFINCLUDEDIR= $(exec_prefix)/include
+-SCRIPTDIR= $(prefix)/$(LIB)
++SCRIPTDIR= $(prefix)/share
+ ABIFLAGS= @ABIFLAGS@
+
+ # Detailed destination directories
+@@ -1046,7 +1046,7 @@
+
+ # Install the library and miscellaneous stuff needed for extending/embedding
+ # This goes into $(exec_prefix)
+-LIBPL= $(LIBDEST)/config-$(LDVERSION)
++LIBPL= $(BINLIBDEST)/config-$(LDVERSION)
+
+ # pkgconfig directory
+ LIBPC= $(LIBDIR)/pkgconfig
+@@ -1065,8 +1065,8 @@
+ if test "$(SO)" = .dll; then \
+ $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \
+ else \
+- $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
+- $(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
++ $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBDIR)/$(LIBRARY) ; \
++ $(RANLIB) $(DESTDIR)$(LIBDIR)/$(LIBRARY) ; \
+ fi; \
+ else \
+ echo Skip install of $(LIBRARY) - use make frameworkinstall; \
+diff -dur Python-3.2.1.orig/Modules/getpath.c Python-3.2.1/Modules/getpath.c
+--- Python-3.2.1.orig/Modules/getpath.c 2011-07-15 20:16:35.536224442 +0200
++++ Python-3.2.1/Modules/getpath.c 2011-07-15 20:17:09.137738543 +0200
@@ -131,7 +131,8 @@
#ifndef PYTHONPATH
#endif
#ifndef LANDMARK
-@@ -143,6 +144,7 @@
+@@ -143,7 +144,8 @@
static wchar_t progpath[MAXPATHLEN+1];
static wchar_t *module_search_path = NULL;
- static wchar_t *lib_python = LIB_PYTHON VERSION;
+ static int module_search_path_malloced = 0;
+-+static wchar_t *lib_python = LIB_PYTHON VERSION;
++static wchar_t *lib_python = LIB_PYTHON VERSION;
+static wchar_t share_python[] = L"share/python" VERSION;
static void
reduce(wchar_t *dir)
-@@ -283,7 +285,7 @@
+@@ -284,7 +286,7 @@
delim = wcschr(prefix, DELIM);
if (delim)
*delim = L'\0';
joinpath(prefix, LANDMARK);
return 1;
}
-@@ -309,7 +311,7 @@
+@@ -310,7 +312,7 @@
copy_absolute(prefix, argv0_path, MAXPATHLEN+1);
do {
n = wcslen(prefix);
joinpath(prefix, LANDMARK);
if (ismodule(prefix))
return 1;
-@@ -319,7 +321,7 @@
+@@ -320,7 +322,7 @@
/* Look at configure's PREFIX */
wcsncpy(prefix, _prefix, MAXPATHLEN);
joinpath(prefix, LANDMARK);
if (ismodule(prefix))
return 1;
-@@ -577,7 +579,7 @@
+@@ -578,7 +580,7 @@
fprintf(stderr,
"Could not find platform independent libraries <prefix>\n");
wcsncpy(prefix, _prefix, MAXPATHLEN);
}
else
reduce(prefix);
-@@ -590,7 +592,7 @@
+@@ -591,7 +593,7 @@
}
else
wcsncpy(zip_path, _prefix, MAXPATHLEN);
bufsz = wcslen(zip_path); /* Replace "00" with version */
zip_path[bufsz - 6] = VERSION[0];
zip_path[bufsz - 5] = VERSION[2];
---- Python-3.2/Lib/site.py.orig 2011-04-02 08:25:12.000000000 +0200
-+++ Python-3.2/Lib/site.py 2011-04-02 08:32:32.061730568 +0200
-@@ -289,9 +289,8 @@
- "python" + sys.version[:3],
- "site-packages"))
- sitepackages.append(os.path.join(prefix, sys.lib, "site-python"))
-- if sys.lib != 'lib':
-- sitepackages.append(os.path.join(prefix, "lib", "python" + sys.version[:3], "site-packages"))
-- sitepackages.append(os.path.join(prefix, "lib", "site-python"))
-+ sitepackages.append(os.path.join(prefix, "share", "python" + sys.version[:3], "site-packages"))
-+ sitepackages.append(os.path.join(prefix, "share", "site-python"))
- else:
- sitepackages.append(prefix)
- sitepackages.append(os.path.join(prefix, sys.lib, "site-packages"))
---- Python-3.0.1/Lib/distutils/sysconfig.py.wiget 2009-02-25 10:58:09.000000000 +0100
-+++ Python-3.0.1/Lib/distutils/sysconfig.py 2009-02-25 10:58:09.000000000 +0100
-@@ -114,12 +114,12 @@ def get_python_lib(plat_specific=0, stan
- prefix = plat_specific and EXEC_PREFIX or PREFIX
-
- if os.name == "posix":
-- if plat_specific:
-- lib = sys.lib
-+ if plat_specific:
-+ libpython = os.path.join(prefix,
-+ sys.lib, "python" + get_python_version())
- else:
-- lib = 'lib'
-- libpython = os.path.join(prefix,
-- lib, "python" + get_python_version())
-+ libpython = os.path.join(prefix,
-+ "share", "python" + get_python_version())
- if standard_lib:
- return libpython
- else:
---- Python-3.2/Lib/distutils/command/install.py.orig 2011-04-02 08:25:12.000000000 +0200
-+++ Python-3.2/Lib/distutils/command/install.py 2011-04-02 08:33:35.957734759 +0200
-@@ -48,14 +48,14 @@
-
- INSTALL_SCHEMES = {
- 'unix_prefix': {
-- 'purelib': '$base/lib/python$py_version_short/site-packages',
-+ 'purelib': '$base/share/python$py_version_short/site-packages',
- 'platlib': '$platbase/'+libname+'/python$py_version_short/site-packages',
- 'headers': '$base/include/python$py_version_short$abiflags/$dist_name',
- 'scripts': '$base/bin',
- 'data' : '$base',
- },
- 'unix_home': {
-- 'purelib': '$base/lib/python',
-+ 'purelib': '$base/share/python',
- 'platlib': '$base/'+libname+'/python',
- 'headers': '$base/include/python/$dist_name',
- 'scripts': '$base/bin',
---- Python-3.2/Makefile.pre.in.orig 2011-04-02 08:25:12.000000000 +0200
-+++ Python-3.2/Makefile.pre.in 2011-04-02 08:34:06.809736435 +0200
-@@ -104,7 +104,7 @@
- MANDIR= @mandir@
- INCLUDEDIR= @includedir@
- CONFINCLUDEDIR= $(exec_prefix)/include
--SCRIPTDIR= $(prefix)/$(LIB)
-+SCRIPTDIR= $(prefix)/share
- ABIFLAGS= @ABIFLAGS@
-
- # Detailed destination directories
-@@ -1036,7 +1036,7 @@
-
- # Install the library and miscellaneous stuff needed for extending/embedding
- # This goes into $(exec_prefix)
--LIBPL= $(LIBDEST)/config-$(LDVERSION)
-+LIBPL= $(BINLIBDEST)/config-$(LDVERSION)
-
- # pkgconfig directory
- LIBPC= $(LIBDIR)/pkgconfig
-@@ -1055,8 +1055,8 @@
- if test "$(SO)" = .dll; then \
- $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \
- else \
-- $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
-- $(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
-+ $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBDIR)/$(LIBRARY) ; \
-+ $(RANLIB) $(DESTDIR)$(LIBDIR)/$(LIBRARY) ; \
- fi; \
- else \
- echo Skip install of $(LIBRARY) - use make frameworkinstall; \
---- Python-3.0.1/Lib/distutils/tests/test_install.py.wig 2009-02-25 11:42:38.000000000 +0100
-+++ Python-3.0.1/Lib/distutils/tests/test_install.py 2009-02-25 11:51:23.000000000 +0100
-@@ -38,7 +38,7 @@ class InstallTestCase(support.TempdirMan
- expected = os.path.normpath(expected)
- self.assertEqual(got, expected)
-
-- libdir = os.path.join(destination, "lib", "python")
-+ libdir = os.path.join(destination, "share", "python")
- platlibdir = os.path.join(destination, sys.lib, "python")
- check_path(cmd.install_lib, libdir)
- check_path(cmd.install_platlib, platlibdir)
projects / packages / python3.git / blobdiff