#if !defined(PREFIX) || !defined(EXEC_PREFIX) || !defined(VERSION) || !defined(VPATH)
#error "PREFIX, EXEC_PREFIX, VERSION, and VPATH must be constant defined"
-@@ -753,7 +753,7 @@ calculate_zip_path(PyCalculatePath *calc
- else {
- wcsncpy(calculate->zip_path, calculate->prefix, MAXPATHLEN);
+@@ -1078,7 +1078,7 @@ calculate_zip_path(PyCalculatePath *calc
+ return PATHLEN_ERR();
+ }
+ }
+- status = joinpath(zip_path, L"lib/python00.zip", zip_path_len);
++ status = joinpath(zip_path, L"" LIB_PYTHON "00.zip", zip_path_len);
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
-- joinpath(calculate->zip_path, L"lib/python00.zip");
-+ joinpath(calculate->zip_path, L"" LIB_PYTHON "00.zip");
-
- /* Replace "00" with version */
- size_t bufsz = wcslen(calculate->zip_path);
@@ -878,7 +878,7 @@ calculate_init(PyCalculatePath *calculat
if (!calculate->prefix) {
return DECODE_LOCALE_ERR("EXEC_PREFIX define", len);
system_include_dirs = ['/usr/include']
# lib_dirs and inc_dirs are used to search for files;
# if a file is found in one of those directories, it can
-@@ -750,11 +749,11 @@
+@@ -953,11 +953,11 @@ class PyBuildExt(build_ext):
elif curses_library:
readline_libs.append(curses_library)
- elif self.compiler.find_library_file(lib_dirs +
+ elif self.compiler.find_library_file(self.lib_dirs +
- ['/usr/lib/termcap'],
+ ['/usr/' + sys.lib + '/termcap'],
'termcap'):
readline_libs.append('termcap')
- exts.append( Extension('readline', ['readline.c'],
-- library_dirs=['/usr/lib/termcap'],
-+ library_dirs=['/usr/' + sys.lib + '/termcap'],
- extra_link_args=readline_extra_link_args,
- libraries=readline_libs) )
+ self.add(Extension('readline', ['readline.c'],
+- library_dirs=['/usr/lib/termcap'],
++ library_dirs=['/usr/' + sys.lib + '/termcap'],
+ extra_link_args=readline_extra_link_args,
+ libraries=readline_libs))
else:
+
+--- Python-3.8.0/Lib/test/test_embed.py~ 2019-10-14 15:34:47.000000000 +0200
++++ Python-3.8.0/Lib/test/test_embed.py 2019-10-15 11:53:55.299065729 +0200
+@@ -1071,11 +1071,11 @@ class InitConfigTests(EmbeddingTestsMixi
+ else:
+ ver = sys.version_info
+ return [
+- os.path.join(prefix, 'lib',
++ os.path.join(prefix, sys.lib,
+ f'python{ver.major}{ver.minor}.zip'),
+- os.path.join(prefix, 'lib',
++ os.path.join(prefix, sys.lib,
+ f'python{ver.major}.{ver.minor}'),
+- os.path.join(exec_prefix, 'lib',
++ os.path.join(exec_prefix, sys.lib,
+ f'python{ver.major}.{ver.minor}', 'lib-dynload'),
+ ]
+