diff -ur Python/Lib/distutils/command/install.py Python.new/Lib/distutils/command/install.py

--- Python/Lib/distutils/command/install.py	2011-06-11 15:46:24 +0000

+++ Python.new/Lib/distutils/command/install.py	2011-10-19 14:27:48 +0000

@@ -42,14 +42,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',

diff -ur Python/Lib/site.py Python.new/Lib/site.py

--- Python/Lib/site.py	2011-06-11 15:46:25 +0000

+++ Python.new/Lib/site.py	2011-10-19 14:31:20 +0000

@@ -300,9 +300,13 @@

         if sys.platform in ('os2emx', 'riscos'):

             sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))

         elif os.sep == '/':

+            sitepackages.append(os.path.join(prefix, "lib64",

+                                        "python" + sys.version[:3],

+                                        "site-packages"))

             sitepackages.append(os.path.join(prefix, "lib",

                                         "python" + sys.version[:3],

                                         "site-packages"))

+            sitepackages.append(os.path.join(prefix, "lib64", "site-python"))

             sitepackages.append(os.path.join(prefix, "lib", "site-python"))

         else:

             sitepackages.append(prefix)

diff --git a/Python/Lib/test/test_site.py b/Python/Lib/test/test_site.py

index 9569135..4e9d879 100644

--- Python/Lib/test/test_site.py

+++ Python.new/Lib/test/test_site.py

@@ -252,11 +252,14 @@ class HelperFunctionsTests(unittest.TestCase):

             self.assertEqual(dirs[0], wanted)

         elif os.sep == '/':

             # OS X, Linux, FreeBSD, etc

-            self.assertEqual(len(dirs), 2)

-            wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3],

+            self.assertEqual(len(dirs), 4)

+            wanted = os.path.join('xoxo', 'lib64', 'python' + sys.version[:3],

                                   'site-packages')

             self.assertEqual(dirs[0], wanted)

-            wanted = os.path.join('xoxo', 'lib', 'site-python')

+            wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3],

+                                  'site-packages')

             self.assertEqual(dirs[1], wanted)

+            wanted = os.path.join('xoxo', 'lib64', 'site-python')

+            self.assertEqual(dirs[2], wanted)

         else:

             # other platforms

diff -ur Python/Makefile.pre.in Python.new/Makefile.pre.in

--- Python/Makefile.pre.in	2011-06-11 15:46:26 +0000

+++ Python.new/Makefile.pre.in	2011-10-19 14:27:48 +0000

@@ -97,7 +97,7 @@

 MANDIR=		@mandir@

 INCLUDEDIR=	@includedir@

 CONFINCLUDEDIR=	$(exec_prefix)/include

-SCRIPTDIR=	$(prefix)/lib

+SCRIPTDIR=	$(prefix)/lib64

 # Detailed destination directories

 BINLIBDEST=	$(LIBDIR)/python$(VERSION)

diff -ur Python/Modules/getpath.c Python.new/Modules/getpath.c

--- Python/Modules/getpath.c	2011-06-11 15:46:27 +0000

+++ Python.new/Modules/getpath.c	2011-10-19 14:27:48 +0000

@@ -129,7 +129,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)

@@ -528,7 +528,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];

@@ -538,7 +538,7 @@

             fprintf(stderr,

                 "Could not find platform dependent libraries <exec_prefix>\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.) */

diff -ur Python/setup.py Python.new/setup.py

--- Python/setup.py	2011-06-11 15:46:28 +0000

+++ Python.new/setup.py	2011-10-19 14:33:00 +0000

@@ -677,11 +677,9 @@

             elif curses_library:

                 readline_libs.append(curses_library)

             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) )

         else:

@@ -715,8 +713,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