| |
@@ -20,10 +20,10 @@
|
| |
'scripts': '$base/bin',
|
| |
'data' : '$base',
|
| |
diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
|
| |
- index e07a6c8..554740d 100644
|
| |
+ index 0a034ee..3ce0dc1 100644
|
| |
--- a/Lib/distutils/sysconfig.py
|
| |
+++ b/Lib/distutils/sysconfig.py
|
| |
- @@ -129,8 +129,12 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
|
| |
+ @@ -147,8 +147,12 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
|
| |
prefix = plat_specific and EXEC_PREFIX or PREFIX
|
| |
|
| |
if os.name == "posix":
|
| |
@@ -53,7 +53,7 @@
|
| |
check_path(cmd.install_headers,
|
| |
os.path.join(destination, "include", "python", "foopkg"))
|
| |
diff --git a/Lib/site.py b/Lib/site.py
|
| |
- index 7dc1b04..85016b4 100644
|
| |
+ index 8786588..78bb790 100644
|
| |
--- a/Lib/site.py
|
| |
+++ b/Lib/site.py
|
| |
@@ -334,11 +334,15 @@ def getsitepackages(prefixes=None):
|
| |
@@ -73,7 +73,7 @@
|
| |
return sitepackages
|
| |
|
| |
diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
|
| |
- index 9ee4d31..53c8606 100644
|
| |
+ index d15cec8..159c78b 100644
|
| |
--- a/Lib/sysconfig.py
|
| |
+++ b/Lib/sysconfig.py
|
| |
@@ -20,10 +20,10 @@ __all__ = [
|
| |
@@ -105,10 +105,10 @@
|
| |
'scripts': '{userbase}/bin',
|
| |
'data': '{userbase}',
|
| |
diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
|
| |
- index 266adf0..e8513b6 100644
|
| |
+ index 568f81d..234cff8 100644
|
| |
--- a/Lib/test/test_site.py
|
| |
+++ b/Lib/test/test_site.py
|
| |
- @@ -275,8 +275,8 @@ class HelperFunctionsTests(unittest.TestCase):
|
| |
+ @@ -269,8 +269,8 @@ class HelperFunctionsTests(unittest.TestCase):
|
| |
dirs = site.getsitepackages()
|
| |
if os.sep == '/':
|
| |
# OS X, Linux, FreeBSD, etc
|
| |
@@ -120,10 +120,10 @@
|
| |
'site-packages')
|
| |
self.assertEqual(dirs[0], wanted)
|
| |
diff --git a/Makefile.pre.in b/Makefile.pre.in
|
| |
- index 59ba9d4..5780ed8 100644
|
| |
+ index beaccf5..bba49ca 100644
|
| |
--- a/Makefile.pre.in
|
| |
+++ b/Makefile.pre.in
|
| |
- @@ -133,7 +133,7 @@ LIBDIR= @libdir@
|
| |
+ @@ -144,7 +144,7 @@ LIBDIR= @libdir@
|
| |
MANDIR= @mandir@
|
| |
INCLUDEDIR= @includedir@
|
| |
CONFINCLUDEDIR= $(exec_prefix)/include
|
| |
@@ -133,10 +133,10 @@
|
| |
|
| |
# Detailed destination directories
|
| |
diff --git a/Modules/getpath.c b/Modules/getpath.c
|
| |
- index 85e737b..2a1fc79 100644
|
| |
+ index ba8d74b..198e8f0 100644
|
| |
--- a/Modules/getpath.c
|
| |
+++ b/Modules/getpath.c
|
| |
- @@ -500,7 +500,7 @@ calculate_exec_prefix(const _PyCoreConfig *core_config,
|
| |
+ @@ -535,7 +535,7 @@ calculate_exec_prefix(const _PyCoreConfig *core_config,
|
| |
"Could not find platform dependent libraries <exec_prefix>\n");
|
| |
}
|
| |
wcsncpy(exec_prefix, calculate->exec_prefix, MAXPATHLEN);
|
| |
@@ -145,7 +145,7 @@
|
| |
}
|
| |
/* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */
|
| |
}
|
| |
- @@ -742,7 +742,7 @@ calculate_zip_path(PyCalculatePath *calculate, const wchar_t *prefix)
|
| |
+ @@ -787,7 +787,7 @@ calculate_zip_path(PyCalculatePath *calculate, const wchar_t *prefix)
|
| |
else {
|
| |
wcsncpy(calculate->zip_path, calculate->prefix, MAXPATHLEN);
|
| |
}
|
| |
@@ -154,8 +154,8 @@
|
| |
|
| |
/* Replace "00" with version */
|
| |
size_t bufsz = wcslen(calculate->zip_path);
|
| |
- @@ -867,7 +867,7 @@ calculate_init(PyCalculatePath *calculate,
|
| |
- if (!calculate->prefix) {
|
| |
+ @@ -912,7 +912,7 @@ calculate_init(PyCalculatePath *calculate,
|
| |
+ if (!calculate->exec_prefix) {
|
| |
return DECODE_LOCALE_ERR("EXEC_PREFIX define", len);
|
| |
}
|
| |
- calculate->lib_python = Py_DecodeLocale("lib/python" VERSION, &len);
|
| |
@@ -164,10 +164,10 @@
|
| |
return DECODE_LOCALE_ERR("EXEC_PREFIX define", len);
|
| |
}
|
| |
diff --git a/setup.py b/setup.py
|
| |
- index f1933f7..450cd8a 100644
|
| |
+ index 88cff61..ecbf798 100644
|
| |
--- a/setup.py
|
| |
+++ b/setup.py
|
| |
- @@ -531,7 +531,7 @@ class PyBuildExt(build_ext):
|
| |
+ @@ -585,7 +585,7 @@ class PyBuildExt(build_ext):
|
| |
# directories (i.e. '.' and 'Include') must be first. See issue
|
| |
# 10520.
|
| |
if not cross_compiling:
|
| |
@@ -176,7 +176,7 @@
|
| |
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
|
| |
# only change this for cross builds for 3.3, issues on Mageia
|
| |
if cross_compiling:
|
| |
- @@ -830,11 +830,11 @@ class PyBuildExt(build_ext):
|
| |
+ @@ -891,11 +891,11 @@ class PyBuildExt(build_ext):
|
| |
elif curses_library:
|
| |
readline_libs.append(curses_library)
|
| |
elif self.compiler.find_library_file(lib_dirs +
|
| |