7eb10c8
diff -up Python-3.2a1/Lib/distutils/command/install.py.lib64 Python-3.2a1/Lib/distutils/command/install.py
7eb10c8
--- Python-3.2a1/Lib/distutils/command/install.py.lib64	2010-07-22 08:50:05.000000000 -0400
7eb10c8
+++ Python-3.2a1/Lib/distutils/command/install.py	2010-08-02 18:33:15.667001759 -0400
7eb10c8
@@ -47,14 +47,14 @@ else:
a3483f9
 INSTALL_SCHEMES = {
a3483f9
     'unix_prefix': {
a3483f9
         'purelib': '$base/lib/python$py_version_short/site-packages',
a3483f9
-        'platlib': '$platbase/lib/python$py_version_short/site-packages',
a3483f9
+        'platlib': '$platbase/lib64/python$py_version_short/site-packages',
a3483f9
         'headers': '$base/include/python$py_version_short/$dist_name',
a3483f9
         'scripts': '$base/bin',
a3483f9
         'data'   : '$base',
a3483f9
         },
a3483f9
     'unix_home': {
a3483f9
         'purelib': '$base/lib/python',
a3483f9
-        'platlib': '$base/lib/python',
a3483f9
+        'platlib': '$base/lib64/python',
a3483f9
         'headers': '$base/include/python/$dist_name',
a3483f9
         'scripts': '$base/bin',
a3483f9
         'data'   : '$base',
7eb10c8
diff -up Python-3.2a1/Lib/distutils/sysconfig.py.lib64 Python-3.2a1/Lib/distutils/sysconfig.py
7eb10c8
--- Python-3.2a1/Lib/distutils/sysconfig.py.lib64	2010-07-23 05:43:17.000000000 -0400
7eb10c8
+++ Python-3.2a1/Lib/distutils/sysconfig.py	2010-08-02 18:33:15.669000547 -0400
7eb10c8
@@ -117,8 +117,12 @@ def get_python_lib(plat_specific=0, stan
a3483f9
         prefix = plat_specific and EXEC_PREFIX or PREFIX
a3483f9
 
a3483f9
     if os.name == "posix":
a3483f9
+        if plat_specific or standard_lib:
a3483f9
+            lib = "lib64"
a3483f9
+        else:
a3483f9
+            lib = "lib"
a3483f9
         libpython = os.path.join(prefix,
a3483f9
-                                 "lib", "python" + get_python_version())
a3483f9
+                                 lib, "python" + get_python_version())
a3483f9
         if standard_lib:
a3483f9
             return libpython
a3483f9
         else:
7eb10c8
diff -up Python-3.2a1/Lib/site.py.lib64 Python-3.2a1/Lib/site.py
7eb10c8
--- Python-3.2a1/Lib/site.py.lib64	2010-06-27 17:45:24.000000000 -0400
7eb10c8
+++ Python-3.2a1/Lib/site.py	2010-08-02 18:34:30.584001242 -0400
7eb10c8
@@ -283,12 +283,16 @@ def getsitepackages():
a3483f9
         if sys.platform in ('os2emx', 'riscos'):
7eb10c8
             sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
a3483f9
         elif os.sep == '/':
7eb10c8
+            sitepackages.append(os.path.join(prefix, "lib64",
a3483f9
+                                        "python" + sys.version[:3],
a3483f9
+                                        "site-packages"))
7eb10c8
             sitepackages.append(os.path.join(prefix, "lib",
a3483f9
                                         "python" + sys.version[:3],
a3483f9
                                         "site-packages"))
7eb10c8
             sitepackages.append(os.path.join(prefix, "lib", "site-python"))
a3483f9
         else:
7eb10c8
             sitepackages.append(prefix)
7eb10c8
+            sitepackages.append(os.path.join(prefix, "lib64", "site-packages"))
7eb10c8
             sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
a3483f9
         if sys.platform == "darwin":
7eb10c8
             # for framework builds *only* we add the standard Apple
7eb10c8
diff -up Python-3.2a1/Makefile.pre.in.lib64 Python-3.2a1/Makefile.pre.in
7eb10c8
--- Python-3.2a1/Makefile.pre.in.lib64	2010-08-02 18:33:15.000000000 -0400
7eb10c8
+++ Python-3.2a1/Makefile.pre.in	2010-08-02 18:35:07.147000664 -0400
7eb10c8
@@ -100,7 +100,7 @@ LIBDIR=		@libdir@
a3483f9
 MANDIR=		@mandir@
a3483f9
 INCLUDEDIR=	@includedir@
a3483f9
 CONFINCLUDEDIR=	$(exec_prefix)/include
a3483f9
-SCRIPTDIR=	$(prefix)/lib
a3483f9
+SCRIPTDIR=	$(prefix)/lib64
a3483f9
 
a3483f9
 # Detailed destination directories
a3483f9
 BINLIBDEST=	$(LIBDIR)/python$(VERSION)
7eb10c8
diff -up Python-3.2a1/Modules/getpath.c.lib64 Python-3.2a1/Modules/getpath.c
7eb10c8
--- Python-3.2a1/Modules/getpath.c.lib64	2010-07-23 12:05:35.000000000 -0400
7eb10c8
+++ Python-3.2a1/Modules/getpath.c	2010-08-02 18:35:50.857000717 -0400
a3483f9
@@ -117,8 +117,8 @@
a3483f9
 #endif
a3483f9
 
a3483f9
 #ifndef PYTHONPATH
a3483f9
-#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
a3483f9
-              EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
a3483f9
+#define PYTHONPATH PREFIX "/lib64/python" VERSION ":" \
a3483f9
+              EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload"
a3483f9
 #endif
a3483f9
 
a3483f9
 #ifndef LANDMARK
7eb10c8
@@ -129,7 +129,7 @@ static wchar_t prefix[MAXPATHLEN+1];
a3483f9
 static wchar_t exec_prefix[MAXPATHLEN+1];
a3483f9
 static wchar_t progpath[MAXPATHLEN+1];
a3483f9
 static wchar_t *module_search_path = NULL;
7eb10c8
-static wchar_t *lib_python = L"lib/python" VERSION;
7eb10c8
+static wchar_t *lib_python = L"lib64/python" VERSION;
a3483f9
 
a3483f9
 /* In principle, this should use HAVE__WSTAT, and _wstat
a3483f9
    should be detected by autoconf. However, no current
7eb10c8
@@ -603,7 +603,7 @@ calculate_path(void)
a3483f9
     }
a3483f9
     else
a3483f9
         wcsncpy(zip_path, L"" PREFIX, MAXPATHLEN);
a3483f9
-    joinpath(zip_path, L"lib/python00.zip");
a3483f9
+    joinpath(zip_path, L"lib64/python00.zip");
7eb10c8
     bufsz = wcslen(zip_path);   /* Replace "00" with version */
a3483f9
     zip_path[bufsz - 6] = VERSION[0];
a3483f9
     zip_path[bufsz - 5] = VERSION[2];
7eb10c8
@@ -613,7 +613,7 @@ calculate_path(void)
a3483f9
             fprintf(stderr,
a3483f9
                 "Could not find platform dependent libraries <exec_prefix>\n");
a3483f9
         wcsncpy(exec_prefix, L"" EXEC_PREFIX, MAXPATHLEN);
a3483f9
-        joinpath(exec_prefix, L"lib/lib-dynload");
a3483f9
+        joinpath(exec_prefix, L"lib64/lib-dynload");
a3483f9
     }
a3483f9
     /* If we found EXEC_PREFIX do *not* reduce it!  (Yet.) */
a3483f9
 
7eb10c8
--- Python-3.2a1/setup.py.lib64	2010-07-23 15:25:47.000000000 -0400
7eb10c8
+++ Python-3.2a1/setup.py	2010-08-02 18:36:51.521000448 -0400
7eb10c8
@@ -343,7 +343,7 @@ class PyBuildExt(build_ext):
a3483f9
 
a3483f9
     def detect_modules(self):
a3483f9
         # Ensure that /usr/local is always used
a3483f9
-        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
a3483f9
+        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64')
a3483f9
         add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
a3483f9
 
a3483f9
         # Add paths specified in the environment variables LDFLAGS and
7eb10c8
@@ -587,11 +587,11 @@ class PyBuildExt(build_ext):
7eb10c8
             elif curses_library:
7eb10c8
                 readline_libs.append(curses_library)
a3483f9
             elif self.compiler.find_library_file(lib_dirs +
7eb10c8
-                                                     ['/usr/lib/termcap'],
7eb10c8
+                                                     ['/usr/lib64/termcap'],
7eb10c8
                                                      'termcap'):
a3483f9
                 readline_libs.append('termcap')
a3483f9
             exts.append( Extension('readline', ['readline.c'],
a3483f9
-                                   library_dirs=['/usr/lib/termcap'],
a3483f9
+                                   library_dirs=['/usr/lib64/termcap'],
a3483f9
                                    extra_link_args=readline_extra_link_args,
a3483f9
                                    libraries=readline_libs) )
a3483f9
         else:
7eb10c8
@@ -628,8 +628,8 @@ class PyBuildExt(build_ext):
a3483f9
             if krb5_h:
a3483f9
                 ssl_incs += krb5_h
a3483f9
         ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
a3483f9
-                                     ['/usr/local/ssl/lib',
a3483f9
-                                      '/usr/contrib/ssl/lib/'
a3483f9
+                                     ['/usr/local/ssl/lib64',
a3483f9
+                                      '/usr/contrib/ssl/lib64/'
a3483f9
                                      ] )
a3483f9
 
a3483f9
         if (ssl_incs is not None and
997d5a2
Index: Lib/sysconfig.py
997d5a2
===================================================================
997d5a2
--- Lib/sysconfig.py
997d5a2
+++ Lib/sysconfig.py	2010-08-22 14:34:38.791426924 +0200
997d5a2
@@ -11,10 +11,10 @@
997d5a2
 
997d5a2
 _INSTALL_SCHEMES = {
997d5a2
     'posix_prefix': {
997d5a2
-        'stdlib': '{base}/lib/python{py_version_short}',
997d5a2
-        'platstdlib': '{platbase}/lib/python{py_version_short}',
997d5a2
-        'purelib': '{base}/lib/python{py_version_short}/site-packages',
997d5a2
-        'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
997d5a2
+        'stdlib': '{base}/lib64/python{py_version_short}',
997d5a2
+        'platstdlib': '{platbase}/lib64/python{py_version_short}',
997d5a2
+        'purelib': '{base}/lib64/python{py_version_short}/site-packages',
997d5a2
+        'platlib': '{platbase}/lib64/python{py_version_short}/site-packages',
997d5a2
         'include': '{base}/include/python{py_version_short}',
997d5a2
         'platinclude': '{platbase}/include/python{py_version_short}',
997d5a2
         'scripts': '{base}/bin',