a7ef9c1
diff -up Python-2.6/Lib/distutils/command/install.py.lib64 Python-2.6/Lib/distutils/command/install.py
a7ef9c1
--- Python-2.6/Lib/distutils/command/install.py.lib64	2008-05-06 18:41:46.000000000 -0400
a7ef9c1
+++ Python-2.6/Lib/distutils/command/install.py	2008-11-24 02:34:04.000000000 -0500
a7ef9c1
@@ -42,14 +42,14 @@ else:
60b7a5f
 INSTALL_SCHEMES = {
60b7a5f
     'unix_prefix': {
60b7a5f
         'purelib': '$base/lib/python$py_version_short/site-packages',
60b7a5f
-        'platlib': '$platbase/lib/python$py_version_short/site-packages',
60b7a5f
+        'platlib': '$platbase/lib64/python$py_version_short/site-packages',
60b7a5f
         'headers': '$base/include/python$py_version_short/$dist_name',
60b7a5f
         'scripts': '$base/bin',
60b7a5f
         'data'   : '$base',
60b7a5f
         },
60b7a5f
     'unix_home': {
60b7a5f
         'purelib': '$base/lib/python',
60b7a5f
-        'platlib': '$base/lib/python',
60b7a5f
+        'platlib': '$base/lib64/python',
60b7a5f
         'headers': '$base/include/python/$dist_name',
60b7a5f
         'scripts': '$base/bin',
60b7a5f
         'data'   : '$base',
a7ef9c1
diff -up Python-2.6/Lib/distutils/sysconfig.py.lib64 Python-2.6/Lib/distutils/sysconfig.py
a7ef9c1
--- Python-2.6/Lib/distutils/sysconfig.py.lib64	2008-06-05 08:58:24.000000000 -0400
a7ef9c1
+++ Python-2.6/Lib/distutils/sysconfig.py	2008-11-24 02:34:04.000000000 -0500
a7ef9c1
@@ -115,8 +115,12 @@ def get_python_lib(plat_specific=0, stan
60b7a5f
         prefix = plat_specific and EXEC_PREFIX or PREFIX
60b7a5f
 
60b7a5f
     if os.name == "posix":
60b7a5f
+        if plat_specific or standard_lib:
60b7a5f
+            lib = "lib64"
60b7a5f
+        else:
60b7a5f
+            lib = "lib"
60b7a5f
         libpython = os.path.join(prefix,
60b7a5f
-                                 "lib", "python" + get_python_version())
60b7a5f
+                                 lib, "python" + get_python_version())
60b7a5f
         if standard_lib:
60b7a5f
             return libpython
60b7a5f
         else:
a7ef9c1
diff -up Python-2.6/Lib/site.py.lib64 Python-2.6/Lib/site.py
a7ef9c1
--- Python-2.6/Lib/site.py.lib64	2008-05-10 13:36:24.000000000 -0400
a7ef9c1
+++ Python-2.6/Lib/site.py	2008-11-24 02:35:51.000000000 -0500
a7ef9c1
@@ -265,12 +265,16 @@ def addsitepackages(known_paths):
a7ef9c1
         if sys.platform in ('os2emx', 'riscos'):
a7ef9c1
             sitedirs.append(os.path.join(prefix, "Lib", "site-packages"))
a7ef9c1
         elif os.sep == '/':
a7ef9c1
+            sitedirs.append(os.path.join(prefix, "lib64",
a7ef9c1
+                                        "python" + sys.version[:3],
a7ef9c1
+                                        "site-packages"))
a7ef9c1
             sitedirs.append(os.path.join(prefix, "lib",
a7ef9c1
                                         "python" + sys.version[:3],
a7ef9c1
                                         "site-packages"))
a7ef9c1
             sitedirs.append(os.path.join(prefix, "lib", "site-python"))
a7ef9c1
         else:
a7ef9c1
             sitedirs.append(prefix)
a7ef9c1
+            sitedirs.append(os.path.join(prefix, "lib64", "site-packages"))
a7ef9c1
             sitedirs.append(os.path.join(prefix, "lib", "site-packages"))
60b7a5f
 
a7ef9c1
         if sys.platform == "darwin":
a7ef9c1
diff -up Python-2.6/Makefile.pre.in.lib64 Python-2.6/Makefile.pre.in
a7ef9c1
--- Python-2.6/Makefile.pre.in.lib64	2008-11-24 02:34:04.000000000 -0500
a7ef9c1
+++ Python-2.6/Makefile.pre.in	2008-11-24 02:34:04.000000000 -0500
a7ef9c1
@@ -87,11 +87,11 @@ datarootdir=    @datarootdir@
60b7a5f
 
60b7a5f
 # Expanded directories
60b7a5f
 BINDIR=		$(exec_prefix)/bin
60b7a5f
-LIBDIR=		$(exec_prefix)/lib
60b7a5f
+LIBDIR=		$(exec_prefix)/lib64
60b7a5f
 MANDIR=		@mandir@
60b7a5f
 INCLUDEDIR=	@includedir@
60b7a5f
 CONFINCLUDEDIR=	$(exec_prefix)/include
60b7a5f
-SCRIPTDIR=	$(prefix)/lib
60b7a5f
+SCRIPTDIR=	$(prefix)/lib64
60b7a5f
 
60b7a5f
 # Detailed destination directories
60b7a5f
 BINLIBDEST=	$(LIBDIR)/python$(VERSION)
a7ef9c1
diff -up Python-2.6/Modules/getpath.c.lib64 Python-2.6/Modules/getpath.c
a7ef9c1
--- Python-2.6/Modules/getpath.c.lib64	2007-03-10 02:38:14.000000000 -0500
a7ef9c1
+++ Python-2.6/Modules/getpath.c	2008-11-24 02:34:04.000000000 -0500
60b7a5f
@@ -117,8 +117,8 @@
60b7a5f
 #endif
60b7a5f
 
60b7a5f
 #ifndef PYTHONPATH
60b7a5f
-#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
60b7a5f
-              EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
60b7a5f
+#define PYTHONPATH PREFIX "/lib64/python" VERSION ":" \
60b7a5f
+              EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload"
60b7a5f
 #endif
60b7a5f
 
60b7a5f
 #ifndef LANDMARK
a7ef9c1
@@ -129,7 +129,7 @@ static char prefix[MAXPATHLEN+1];
60b7a5f
 static char exec_prefix[MAXPATHLEN+1];
60b7a5f
 static char progpath[MAXPATHLEN+1];
60b7a5f
 static char *module_search_path = NULL;
60b7a5f
-static char lib_python[] = "lib/python" VERSION;
60b7a5f
+static char lib_python[] = "lib64/python" VERSION;
60b7a5f
 
60b7a5f
 static void
60b7a5f
 reduce(char *dir)
a7ef9c1
@@ -524,7 +524,7 @@ calculate_path(void)
60b7a5f
     }
60b7a5f
     else
60b7a5f
         strncpy(zip_path, PREFIX, MAXPATHLEN);
60b7a5f
-    joinpath(zip_path, "lib/python00.zip");
60b7a5f
+    joinpath(zip_path, "lib64/python00.zip");
60b7a5f
     bufsz = strlen(zip_path);	/* Replace "00" with version */
60b7a5f
     zip_path[bufsz - 6] = VERSION[0];
60b7a5f
     zip_path[bufsz - 5] = VERSION[2];
a7ef9c1
@@ -534,7 +534,7 @@ calculate_path(void)
60b7a5f
             fprintf(stderr,
60b7a5f
                 "Could not find platform dependent libraries <exec_prefix>\n");
60b7a5f
         strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN);
60b7a5f
-        joinpath(exec_prefix, "lib/lib-dynload");
60b7a5f
+        joinpath(exec_prefix, "lib64/lib-dynload");
60b7a5f
     }
60b7a5f
     /* If we found EXEC_PREFIX do *not* reduce it!  (Yet.) */
60b7a5f
 
a7ef9c1
diff -up Python-2.6/Modules/Setup.dist.lib64 Python-2.6/Modules/Setup.dist
a7ef9c1
--- Python-2.6/Modules/Setup.dist.lib64	2008-11-24 02:34:04.000000000 -0500
a7ef9c1
+++ Python-2.6/Modules/Setup.dist	2008-11-24 02:34:04.000000000 -0500
a7ef9c1
@@ -408,7 +408,7 @@ gdbm gdbmmodule.c -I/usr/local/include -
a7ef9c1
 # and the subdirectory of PORT where you built it.
a7ef9c1
 DBLIBVER=4.7
a7ef9c1
 DBINC=/usr/include/db4
a7ef9c1
-DBLIB=/usr/lib
a7ef9c1
+DBLIB=/usr/lib64
a7ef9c1
 _bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
a7ef9c1
 
a7ef9c1
 # Historical Berkeley DB 1.85
a7ef9c1
@@ -454,7 +454,7 @@ cPickle cPickle.c
a7ef9c1
 # Andrew Kuchling's zlib module.
a7ef9c1
 # This require zlib 1.1.3 (or later).
a7ef9c1
 # See http://www.gzip.org/zlib/
a7ef9c1
-zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
a7ef9c1
+zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib64 -lz
a7ef9c1
 
a7ef9c1
 # Interface to the Expat XML parser
a7ef9c1
 #
a7ef9c1
diff -up Python-2.6/setup.py.lib64 Python-2.6/setup.py
a7ef9c1
--- Python-2.6/setup.py.lib64	2008-11-24 02:34:04.000000000 -0500
a7ef9c1
+++ Python-2.6/setup.py	2008-11-24 02:34:04.000000000 -0500
a7ef9c1
@@ -310,7 +310,7 @@ class PyBuildExt(build_ext):
a7ef9c1
 
a7ef9c1
     def detect_modules(self):
a7ef9c1
         # Ensure that /usr/local is always used
a7ef9c1
-        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
a7ef9c1
+        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64')
a7ef9c1
         add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
a7ef9c1
 
a7ef9c1
         # Add paths specified in the environment variables LDFLAGS and
a7ef9c1
@@ -583,11 +583,11 @@ class PyBuildExt(build_ext):
a7ef9c1
             elif self.compiler.find_library_file(lib_dirs, 'curses'):
a7ef9c1
                 readline_libs.append('curses')
a7ef9c1
             elif self.compiler.find_library_file(lib_dirs +
a7ef9c1
-                                               ['/usr/lib/termcap'],
a7ef9c1
+                                               ['/usr/lib64/termcap'],
a7ef9c1
                                                'termcap'):
a7ef9c1
                 readline_libs.append('termcap')
a7ef9c1
             exts.append( Extension('readline', ['readline.c'],
a7ef9c1
-                                   library_dirs=['/usr/lib/termcap'],
a7ef9c1
+                                   library_dirs=['/usr/lib64/termcap'],
a7ef9c1
                                    extra_link_args=readline_extra_link_args,
a7ef9c1
                                    libraries=readline_libs) )
a7ef9c1
         else:
a7ef9c1
@@ -624,8 +624,8 @@ class PyBuildExt(build_ext):
a7ef9c1
             if krb5_h:
a7ef9c1
                 ssl_incs += krb5_h
a7ef9c1
         ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
a7ef9c1
-                                     ['/usr/local/ssl/lib',
a7ef9c1
-                                      '/usr/contrib/ssl/lib/'
a7ef9c1
+                                     ['/usr/local/ssl/lib64',
a7ef9c1
+                                      '/usr/contrib/ssl/lib64/'
a7ef9c1
                                      ] )
a7ef9c1
 
a7ef9c1
         if (ssl_incs is not None and