--- Python-2.3.2/Lib/distutils/command/install.py.lib64 2002-11-19 08:12:28.000000000 -0500 +++ Python-2.3.2/Lib/distutils/command/install.py 2003-11-07 12:04:05.000000000 -0500 @@ -39,14 +39,14 @@ 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', --- Python-2.3.2/Lib/distutils/sysconfig.py.lib64 2003-02-10 09:02:33.000000000 -0500 +++ Python-2.3.2/Lib/distutils/sysconfig.py 2003-11-07 12:04:05.000000000 -0500 @@ -100,7 +100,7 @@ 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: --- Python-2.3.2/Lib/site.py.lib64 2003-07-18 13:45:33.000000000 -0400 +++ Python-2.3.2/Lib/site.py 2003-11-07 12:04:05.000000000 -0500 @@ -167,9 +167,14 @@ sitedirs = [os.path.join(prefix, "Lib", "site-packages")] elif os.sep == '/': sitedirs = [os.path.join(prefix, + "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")] --- Python-2.3.2/Modules/getpath.c.lib64 2002-12-31 07:45:12.000000000 -0500 +++ Python-2.3.2/Modules/getpath.c 2003-11-07 12:04:05.000000000 -0500 @@ -112,8 +112,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 @@ -124,7 +124,7 @@ 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) @@ -492,7 +492,7 @@ } 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]; @@ -502,7 +502,7 @@ 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.) */ --- Python-2.3.2/Modules/Setup.dist.lib64 2003-11-07 12:04:05.000000000 -0500 +++ Python-2.3.2/Modules/Setup.dist 2003-11-07 12:04:05.000000000 -0500 @@ -343,7 +343,7 @@ # *** Uncomment and edit to reflect your Tcl/Tk versions: -ltk -ltcl \ # *** Uncomment and edit to reflect where your X11 libraries are: - -L/usr/X11R6/lib \ + -L/usr/X11R6/lib64 \ # *** Or uncomment this for Solaris: # -L/usr/openwin/lib \ # *** Uncomment these for TOGL extension only: @@ -416,7 +416,7 @@ # and the subdirectory of PORT where you built it. DBLIBVER=4.2 DBINC=/usr/include/db4 -DBLIB=/usr/lib +DBLIB=/usr/lib64 _bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER) # Historical Berkeley DB 1.85 @@ -462,7 +462,7 @@ # Andrew Kuchling's zlib module. # This require zlib 1.1.3 (or later). # See http://www.cdrom.com/pub/infozip/zlib/ -zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz +zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib64 -lz # Interface to the Expat XML parser # --- Python-2.3.2/setup.py.lib64 2003-09-21 21:19:45.000000000 -0400 +++ Python-2.3.2/setup.py 2003-11-07 12:04:05.000000000 -0500 @@ -241,7 +241,7 @@ def detect_modules(self): # Ensure that /usr/local is always used - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') + add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64') add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') # fink installs lots of goodies in /sw/... - make sure we @@ -264,7 +264,7 @@ # lib_dirs and inc_dirs are used to search for files; # if a file is found in one of those directories, it can # be assumed that no additional -I,-L directives are needed. - lib_dirs = self.compiler.library_dirs + ['/lib', '/usr/lib'] + lib_dirs = self.compiler.library_dirs + ['/lib64', '/usr/lib64'] inc_dirs = self.compiler.include_dirs + ['/usr/include'] exts = [] @@ -413,11 +413,11 @@ elif self.compiler.find_library_file(lib_dirs, 'curses'): readline_libs.append('curses') elif self.compiler.find_library_file(lib_dirs + - ['/usr/lib/termcap'], + ['/usr/lib64/termcap'], 'termcap'): readline_libs.append('termcap') exts.append( Extension('readline', ['readline.c'], - library_dirs=['/usr/lib/termcap'], + library_dirs=['/usr/lib64/termcap'], libraries=readline_libs) ) if platform not in ['mac']: # crypt module. @@ -446,8 +446,8 @@ 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 @@ -481,12 +481,12 @@ # order you wish to search - e.g., search for db4 before db3 db_try_this = { 'db4': {'libs': ('db-4.2', 'db42', 'db-4.1', 'db41', 'db-4.0', 'db4',), - 'libdirs': ('/usr/local/BerkeleyDB.4.2/lib', - '/usr/local/BerkeleyDB.4.1/lib', - '/usr/local/BerkeleyDB.4.0/lib', - '/usr/local/lib', + 'libdirs': ('/usr/local/BerkeleyDB.4.2/lib64', + '/usr/local/BerkeleyDB.4.1/lib64', + '/usr/local/BerkeleyDB.4.0/lib64', + '/usr/local/lib64', '/opt/sfw', - '/sw/lib', + '/sw/lib64', ), 'incdirs': ('/usr/local/BerkeleyDB.4.2/include', '/usr/local/include/db42', @@ -499,12 +499,12 @@ '/usr/include/db4', )}, 'db3': {'libs': ('db-3.3', 'db-3.2', 'db-3.1', 'db3',), - 'libdirs': ('/usr/local/BerkeleyDB.3.3/lib', - '/usr/local/BerkeleyDB.3.2/lib', - '/usr/local/BerkeleyDB.3.1/lib', - '/usr/local/lib', - '/opt/sfw/lib', - '/sw/lib', + 'libdirs': ('/usr/local/BerkeleyDB.3.3/lib64', + '/usr/local/BerkeleyDB.3.2/lib64', + '/usr/local/BerkeleyDB.3.1/lib64', + '/usr/local/lib64', + '/opt/sfw/lib64', + '/sw/lib64', ), 'incdirs': ('/usr/local/BerkeleyDB.3.3/include', '/usr/local/BerkeleyDB.3.2/include', @@ -981,14 +981,14 @@ added_lib_dirs.append('/usr/openwin/lib') elif os.path.exists('/usr/X11R6/include'): include_dirs.append('/usr/X11R6/include') - added_lib_dirs.append('/usr/X11R6/lib') + added_lib_dirs.append('/usr/X11R6/lib64') elif os.path.exists('/usr/X11R5/include'): include_dirs.append('/usr/X11R5/include') - added_lib_dirs.append('/usr/X11R5/lib') + added_lib_dirs.append('/usr/X11R5/lib64') else: # Assume default location for X11 include_dirs.append('/usr/X11/include') - added_lib_dirs.append('/usr/X11/lib') + added_lib_dirs.append('/usr/X11/lib64') # If Cygwin, then verify that X is installed before proceeding if platform == 'cygwin': --- Python-2.3.2/Makefile.pre.in.lib64 2003-11-07 12:07:49.000000000 -0500 +++ Python-2.3.2/Makefile.pre.in 2003-11-07 12:08:11.000000000 -0500 @@ -79,11 +79,11 @@ # 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)