Index: Makefile.pre.in =================================================================== --- Makefile.pre.in +++ Makefile.pre.in 2006-09-26 15:58:33.000000000 +0200 @@ -75,6 +75,8 @@ # Machine-dependent subdirectories MACHDEP= @MACHDEP@ +LIB= @LIB@ +ARCH= @ARCH@ # Install prefix for architecture-independent files prefix= @prefix@ @@ -84,11 +86,11 @@ # Expanded directories BINDIR= $(exec_prefix)/bin -LIBDIR= $(exec_prefix)/lib +LIBDIR= $(exec_prefix)/$(LIB) MANDIR= @mandir@ INCLUDEDIR= @includedir@ CONFINCLUDEDIR= $(exec_prefix)/include -SCRIPTDIR= $(prefix)/lib +SCRIPTDIR= $(prefix)/$(LIB) # Detailed destination directories BINLIBDEST= $(LIBDIR)/python$(VERSION) @@ -491,7 +493,7 @@ Python/compile.o Python/symtable.o: $(GRAMMAR_H) $(AST_H) Python/getplatform.o: $(srcdir)/Python/getplatform.c - $(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c + $(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -DARCH='"$(ARCH)"' -DLIB='"$(LIB)"' -o $@ $(srcdir)/Python/getplatform.c Python/importdl.o: $(srcdir)/Python/importdl.c $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c Index: configure.in =================================================================== --- configure.in +++ configure.in 2006-09-26 15:58:33.000000000 +0200 @@ -503,6 +503,41 @@ ;; esac +AC_SUBST(ARCH) +AC_MSG_CHECKING(ARCH) +ARCH=`uname -m` +case $ARCH in +i?86) ARCH=i386;; +esac +AC_MSG_RESULT($ARCH) + +AC_SUBST(LIB) +AC_MSG_CHECKING(LIB) +case $ac_sys_system in +Linux*) + # Test if the compiler is 64bit + echo 'int i;' > conftest.$ac_ext + python_cv_cc_64bit_output=no + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.$ac_objext` in + *"ELF 64"*) + python_cv_cc_64bit_output=yes + ;; + esac + fi + rm -rf conftest* + ;; +esac + +case $ARCH:$python_cv_cc_64bit_output in +ppc64:yes | powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes) + LIB="lib64" + ;; +*:*) + LIB="lib" + ;; +esac +AC_MSG_RESULT($LIB) AC_SUBST(LIBRARY) AC_MSG_CHECKING(LIBRARY) Index: setup.py =================================================================== --- setup.py +++ setup.py 2006-09-26 16:21:59.000000000 +0200 @@ -290,12 +290,12 @@ except NameError: have_unicode = 0 + libname = sys.lib # 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 + [ - '/lib64', '/usr/lib64', - '/lib', '/usr/lib', + libname, '/usr/'+libname ] inc_dirs = self.compiler.include_dirs + ['/usr/include'] exts = [] @@ -496,11 +496,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/'+libname+'/termcap'], 'termcap'): readline_libs.append('termcap') exts.append( Extension('readline', ['readline.c'], - library_dirs=['/usr/lib/termcap'], + library_dirs=['/usr/'+libname+'/termcap'], extra_link_args=readline_extra_link_args, libraries=readline_libs) ) if platform not in ['mac']: @@ -1248,8 +1248,8 @@ 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/lib64') - added_lib_dirs.append('/usr/X11R6/lib') + added_lib_dirs.append('/usr/X11R6/'+sys.lib) + #added_lib_dirs.append('/usr/X11R6/lib') elif os.path.exists('/usr/X11R5/include'): include_dirs.append('/usr/X11R5/include') added_lib_dirs.append('/usr/X11R5/lib') Index: Modules/getpath.c =================================================================== --- Modules/getpath.c +++ Modules/getpath.c 2006-09-26 15:58:32.000000000 +0200 @@ -116,9 +116,17 @@ #define EXEC_PREFIX PREFIX #endif +#ifndef LIB_PYTHON +#if defined(__x86_64__) || defined(__powerpc64__) +#define LIB_PYTHON "lib64/python" VERSION +#else +#define LIB_PYTHON "lib/python" VERSION +#endif +#endif + #ifndef PYTHONPATH -#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \ - EXEC_PREFIX "/lib/python" VERSION "/lib-dynload" +#define PYTHONPATH PREFIX "/" LIB_PYTHON ":" \ + EXEC_PREFIX "/" LIB_PYTHON "/lib-dynload" #endif #ifndef LANDMARK @@ -129,7 +137,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[] = LIB_PYTHON; static void reduce(char *dir) Index: Lib/site.py =================================================================== --- Lib/site.py +++ Lib/site.py 2006-09-26 15:58:32.000000000 +0200 @@ -182,12 +182,18 @@ sitedirs = [os.path.join(prefix, "Lib", "site-packages")] elif os.sep == '/': sitedirs = [os.path.join(prefix, - "lib", + sys.lib, "python" + sys.version[:3], "site-packages"), - os.path.join(prefix, "lib", "site-python")] + os.path.join(prefix, sys.lib, "site-python")] + if sys.lib != 'lib': + sitedirs.append(os.path.join(prefix, + 'lib', + "python" + sys.version[:3], + "site-packages")) + sitedirs.append(os.path.join(prefix, 'lib', "site-python")) else: - sitedirs = [prefix, os.path.join(prefix, "lib", "site-packages")] + sitedirs = [prefix, os.path.join(prefix, sys.lib, "site-packages")] if sys.platform == 'darwin': # for framework builds *only* we add the standard Apple # locations. Currently only per-user, but /Library and Index: Lib/distutils/sysconfig.py =================================================================== --- Lib/distutils/sysconfig.py +++ Lib/distutils/sysconfig.py 2006-09-26 16:29:57.000000000 +0200 @@ -99,8 +99,12 @@ prefix = plat_specific and EXEC_PREFIX or PREFIX if os.name == "posix": + if plat_specific: + lib = sys.lib + else: + lib = 'lib' libpython = os.path.join(prefix, - "lib", "python" + get_python_version()) + lib, "python" + get_python_version()) if standard_lib: return libpython else: @@ -187,7 +191,8 @@ if python_build: inc_dir = argv0_path else: - inc_dir = get_python_inc(plat_specific=1) + prefix = EXEC_PREFIX or PREFIX + inc_dir = os.path.join(prefix, "include", "multiarch-" + sys.arch + "-linux", "python" + sys.version[:3]) if get_python_version() < '2.2': config_h = 'config.h' else: Index: Lib/distutils/tests/test_install.py =================================================================== --- Lib/distutils/tests/test_install.py +++ Lib/distutils/tests/test_install.py 2006-09-26 15:58:32.000000000 +0200 @@ -1,6 +1,6 @@ """Tests for distutils.command.install.""" -import os +import os,sys import unittest from distutils.command.install import install @@ -39,8 +39,9 @@ self.assertEqual(got, expected) libdir = os.path.join(destination, "lib", "python") + platlibdir = os.path.join(destination, sys.lib, "python") check_path(cmd.install_lib, libdir) - check_path(cmd.install_platlib, libdir) + check_path(cmd.install_platlib, platlibdir) check_path(cmd.install_purelib, libdir) check_path(cmd.install_headers, os.path.join(destination, "include", "python", "foopkg")) Index: Lib/distutils/command/install.py =================================================================== --- Lib/distutils/command/install.py +++ Lib/distutils/command/install.py 2006-09-26 15:58:32.000000000 +0200 @@ -19,6 +19,8 @@ from distutils.errors import DistutilsOptionError from glob import glob +libname = sys.lib + if sys.version < "2.2": WINDOWS_SCHEME = { 'purelib': '$base', @@ -39,14 +41,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/'+libname+'/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/'+libname+'/python', 'headers': '$base/include/python/$dist_name', 'scripts': '$base/bin', 'data' : '$base', Index: Python/getplatform.c =================================================================== --- Python/getplatform.c +++ Python/getplatform.c 2006-09-26 15:58:32.000000000 +0200 @@ -10,3 +10,23 @@ { return PLATFORM; } + +#ifndef ARCH +#define ARCH "unknown" +#endif + +const char * +Py_GetArch(void) +{ + return ARCH; +} + +#ifndef LIB +#define LIB "lib" +#endif + +const char * +Py_GetLib(void) +{ + return LIB; +} Index: Python/sysmodule.c =================================================================== --- Python/sysmodule.c +++ Python/sysmodule.c 2006-09-26 16:52:51.000000000 +0200 @@ -1157,6 +1157,10 @@ PyString_FromString(Py_GetPlatform())); SET_SYS_FROM_STRING("executable", PyString_FromString(Py_GetProgramFullPath())); + SET_SYS_FROM_STRING("arch", + PyString_FromString(Py_GetArch())); + SET_SYS_FROM_STRING("lib", + PyString_FromString(Py_GetLib())); SET_SYS_FROM_STRING("prefix", PyString_FromString(Py_GetPrefix())); SET_SYS_FROM_STRING("exec_prefix", Index: Include/pythonrun.h =================================================================== --- Include/pythonrun.h +++ Include/pythonrun.h 2006-09-26 15:58:32.000000000 +0200 @@ -107,6 +107,8 @@ /* In their own files */ PyAPI_FUNC(const char *) Py_GetVersion(void); PyAPI_FUNC(const char *) Py_GetPlatform(void); +PyAPI_FUNC(const char *) Py_GetArch(void); +PyAPI_FUNC(const char *) Py_GetLib(void); PyAPI_FUNC(const char *) Py_GetCopyright(void); PyAPI_FUNC(const char *) Py_GetCompiler(void); PyAPI_FUNC(const char *) Py_GetBuildInfo(void);