--- a/Python/Lib/distutils/command/install.py +++ b/Python/Lib/distutils/command/install.py @@ -39,14 +39,14 @@ else: INSTALL_SCHEMES = { 'unix_prefix': { 'purelib': '$base/lib/python$py_version_short/site-packages', - 'platlib': '$platbase/lib/python$py_version_short/site-packages', + 'platlib': '$platbase/lib64/python$py_version_short/site-packages', 'headers': '$base/include/python$py_version_short/$dist_name', 'scripts': '$base/bin', 'data' : '$base', }, 'unix_home': { 'purelib': '$base/lib/python', - 'platlib': '$base/lib/python', + 'platlib': '$base/lib64/python', 'headers': '$base/include/python/$dist_name', 'scripts': '$base/bin', 'data' : '$base', --- a/Python/Lib/distutils/sysconfig.py +++ b/Python/Lib/distutils/sysconfig.py @@ -100,7 +100,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): if os.name == "posix": libpython = os.path.join(prefix, - "lib", "python" + get_python_version()) + "lib64", "python" + get_python_version()) if standard_lib: return libpython else: --- a/Python/Lib/site.py +++ b/Python/Lib/site.py @@ -182,9 +182,14 @@ def addsitepackages(known_paths): sitedirs = [os.path.join(prefix, "Lib", "site-packages")] elif os.sep == '/': sitedirs = [os.path.join(prefix, - "lib", + "lib64", "python" + sys.version[:3], "site-packages"), + os.path.join(prefix, + "lib", + "python" + sys.version[:3], + "site-packages"), + os.path.join(prefix, "lib64", "site-python"), os.path.join(prefix, "lib", "site-python")] else: sitedirs = [prefix, os.path.join(prefix, "lib", "site-packages")] --- a/Python/Makefile.pre.in +++ b/Python/Makefile.pre.in @@ -84,11 +84,11 @@ exec_prefix= @exec_prefix@ # Expanded directories BINDIR= $(exec_prefix)/bin -LIBDIR= $(exec_prefix)/lib +LIBDIR= $(exec_prefix)/lib64 MANDIR= @mandir@ INCLUDEDIR= @includedir@ CONFINCLUDEDIR= $(exec_prefix)/include -SCRIPTDIR= $(prefix)/lib +SCRIPTDIR= $(prefix)/lib64 # Detailed destination directories BINLIBDEST= $(LIBDIR)/python$(VERSION) --- a/Python/Modules/getpath.c +++ b/Python/Modules/getpath.c @@ -117,8 +117,8 @@ #endif #ifndef PYTHONPATH -#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \ - EXEC_PREFIX "/lib/python" VERSION "/lib-dynload" +#define PYTHONPATH PREFIX "/lib64/python" VERSION ":" \ + EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload" #endif #ifndef LANDMARK @@ -129,7 +129,7 @@ static char prefix[MAXPATHLEN+1]; static char exec_prefix[MAXPATHLEN+1]; static char progpath[MAXPATHLEN+1]; static char *module_search_path = NULL; -static char lib_python[] = "lib/python" VERSION; +static char lib_python[] = "lib64/python" VERSION; static void reduce(char *dir) @@ -524,7 +524,7 @@ calculate_path(void) } else strncpy(zip_path, PREFIX, MAXPATHLEN); - joinpath(zip_path, "lib/python00.zip"); + joinpath(zip_path, "lib64/python00.zip"); bufsz = strlen(zip_path); /* Replace "00" with version */ zip_path[bufsz - 6] = VERSION[0]; zip_path[bufsz - 5] = VERSION[2]; @@ -534,7 +534,7 @@ calculate_path(void) fprintf(stderr, "Could not find platform dependent libraries \n"); strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN); - joinpath(exec_prefix, "lib/lib-dynload"); + joinpath(exec_prefix, "lib64/lib-dynload"); } /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */ --- a/Python/setup.py +++ b/Python/setup.py @@ -497,11 +497,9 @@ class PyBuildExt(build_ext): elif self.compiler.find_library_file(lib_dirs, 'curses'): readline_libs.append('curses') elif self.compiler.find_library_file(lib_dirs + - ['/usr/lib/termcap'], 'termcap'): readline_libs.append('termcap') exts.append( Extension('readline', ['readline.c'], - library_dirs=['/usr/lib/termcap'], extra_link_args=readline_extra_link_args, libraries=readline_libs) ) if platform not in ['mac']: @@ -533,8 +531,8 @@ class PyBuildExt(build_ext): if krb5_h: ssl_incs += krb5_h ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, - ['/usr/local/ssl/lib', - '/usr/contrib/ssl/lib/' + ['/usr/local/ssl/lib64', + '/usr/contrib/ssl/lib64/' ] ) if (ssl_incs is not None and