--- /dev/null
+--- Python-2.5b2/configure.in.orig 2006-07-06 11:13:35.000000000 +0100
++++ Python-2.5b2/configure.in 2006-07-12 16:30:30.000000000 +0100
+@@ -753,13 +753,13 @@
+ if test "$Py_DEBUG" = 'true' ; then
+ # Optimization messes up debuggers, so turn it off for
+ # debug builds.
+- OPT="-g -Wall $STRICT_PROTO"
++ OPT="-g $CPPFLAGS $CFLAGS -Wall $STRICT_PROTO"
+ else
+- OPT="-g -O3 -Wall $STRICT_PROTO"
++ OPT="-g $CPPFLAGS $CFLAGS -Wall $STRICT_PROTO"
+ fi
+ ;;
+ *)
+- OPT="-O3 -Wall $STRICT_PROTO"
++ OPT="$CPPFLAGS $CFLAGS -Wall $STRICT_PROTO"
+ ;;
+ esac
+ case $ac_sys_system in
+--- Python-2.5c1.orig/Makefile.pre.in 2006-07-30 17:20:10.000000000 +0100
++++ Python-2.5c1/Makefile.pre.in 2006-08-25 17:51:05.000000000 +0100
+@@ -852,7 +852,7 @@
+ $(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
+ # Substitution happens here, as the completely-expanded BINDIR
+ # is not available in configure
+- sed -e "s,@EXENAME@,$(BINDIR)/python$(VERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config
++ sed -e "s,@EXENAME@,$(BINDIR)/python$(EXE)," < $(srcdir)/Misc/python-config.in >python-config
+ $(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(VERSION)-config
+ rm python-config
+ @if [ -s Modules/python.exp -a \
--- /dev/null
+diff -Nur Python-2.5b2.orig/configure.in Python-2.5b2/configure.in
+--- Python-2.5b2.orig/configure.in 2006-07-06 11:13:35.000000000 +0100
++++ Python-2.5b2/configure.in 2006-07-12 17:42:51.000000000 +0100
+@@ -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
++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)
+diff -Nur Python-2.5b2.orig/Include/pythonrun.h Python-2.5b2/Include/pythonrun.h
+--- Python-2.5b2.orig/Include/pythonrun.h 2006-04-03 07:26:32.000000000 +0100
++++ Python-2.5b2/Include/pythonrun.h 2006-07-12 17:42:51.000000000 +0100
+@@ -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);
+diff -Nur Python-2.5b2.orig/Lib/distutils/command/install.py Python-2.5b2/Lib/distutils/command/install.py
+--- Python-2.5b2.orig/Lib/distutils/command/install.py 2006-03-27 22:55:21.000000000 +0100
++++ Python-2.5b2/Lib/distutils/command/install.py 2006-07-12 17:42:51.000000000 +0100
+@@ -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',
+diff -Nur Python-2.5b2.orig/Lib/distutils/sysconfig.py Python-2.5b2/Lib/distutils/sysconfig.py
+--- Python-2.5b2.orig/Lib/distutils/sysconfig.py 2006-06-27 11:08:25.000000000 +0100
++++ Python-2.5b2/Lib/distutils/sysconfig.py 2006-07-12 17:42:51.000000000 +0100
+@@ -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:
+diff -Nur Python-2.5b2.orig/Lib/distutils/tests/test_install.py Python-2.5b2/Lib/distutils/tests/test_install.py
+--- Python-2.5b2.orig/Lib/distutils/tests/test_install.py 2004-06-26 00:02:59.000000000 +0100
++++ Python-2.5b2/Lib/distutils/tests/test_install.py 2006-07-12 17:42:51.000000000 +0100
+@@ -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"))
+diff -Nur Python-2.5b2.orig/Lib/site.py Python-2.5b2/Lib/site.py
+--- Python-2.5b2.orig/Lib/site.py 2006-06-12 09:23:02.000000000 +0100
++++ Python-2.5b2/Lib/site.py 2006-07-12 17:42:51.000000000 +0100
+@@ -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
+diff -Nur Python-2.5b2.orig/Makefile.pre.in Python-2.5b2/Makefile.pre.in
+--- Python-2.5b2.orig/Makefile.pre.in 2006-06-27 16:45:32.000000000 +0100
++++ Python-2.5b2/Makefile.pre.in 2006-07-12 17:42:51.000000000 +0100
+@@ -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)
+@@ -489,7 +491,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
+diff -Nur Python-2.5b2.orig/Modules/getpath.c Python-2.5b2/Modules/getpath.c
+--- Python-2.5b2.orig/Modules/getpath.c 2006-07-10 02:18:57.000000000 +0100
++++ Python-2.5b2/Modules/getpath.c 2006-07-12 17:42:51.000000000 +0100
+@@ -116,9 +116,17 @@
+ #define EXEC_PREFIX PREFIX
+ #endif
+
++#ifndef LIB_PYTHON
++#if defined(__x86_64__) || (defined(__sparc__) && defined(__arch64__)) || defined(__powerpc64__) || defined(__s390x__)
++#define LIB_PYTHON "lib64/python"
++#else
++#define LIB_PYTHON "lib/python"
++#endif
++#endif
++
+ #ifndef PYTHONPATH
+-#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
+- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
++#define PYTHONPATH PREFIX "/" LIB_PYTHON VERSION ":" \
++ EXEC_PREFIX "/" LIB_PYTHON VERSION "/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 VERSION;
+
+ static void
+ reduce(char *dir)
+diff -Nur Python-2.5b2.orig/Python/getplatform.c Python-2.5b2/Python/getplatform.c
+--- Python-2.5b2.orig/Python/getplatform.c 2000-09-02 00:29:29.000000000 +0100
++++ Python-2.5b2/Python/getplatform.c 2006-07-12 17:42:51.000000000 +0100
+@@ -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;
++}
+diff -Nur Python-2.5b2.orig/Python/sysmodule.c Python-2.5b2/Python/sysmodule.c
+--- Python-2.5b2.orig/Python/sysmodule.c 2006-07-10 22:08:24.000000000 +0100
++++ Python-2.5b2/Python/sysmodule.c 2006-07-12 17:42:51.000000000 +0100
+@@ -1080,6 +1080,10 @@
+ PyUnicode_FromString(Py_GetCopyright()));
+ SET_SYS_FROM_STRING("platform",
+ PyUnicode_FromString(Py_GetPlatform()));
++ SET_SYS_FROM_STRING("arch",
++ PyUnicode_FromString(Py_GetArch()));
++ SET_SYS_FROM_STRING("lib",
++ PyUnicode_FromString(Py_GetLib()));
+ SET_SYS_FROM_STRING("executable",
+ PyUnicode_FromString(Py_GetProgramFullPath()));
+ SET_SYS_FROM_STRING("prefix",
+diff -Nur Python-2.5b2.orig/setup.py Python-2.5b2/setup.py
+--- Python-2.5b2.orig/setup.py 2006-06-30 07:18:39.000000000 +0100
++++ Python-2.5b2/setup.py 2006-07-12 17:45:14.000000000 +0100
+@@ -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']:
+@@ -1244,8 +1244,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')
--- /dev/null
+diff -urN Python-3.0a1.org/Modules/dbmmodule.c Python-3.0a1/Modules/dbmmodule.c
+--- Python-3.0a1.org/Modules/dbmmodule.c 2007-08-14 18:29:22.000000000 +0200
++++ Python-3.0a1/Modules/dbmmodule.c 2007-09-02 20:09:52.356906353 +0200
+@@ -11,22 +11,12 @@
+ /* Some Linux systems install gdbm/ndbm.h, but not ndbm.h. This supports
+ * whichever configure was able to locate.
+ */
+-#if defined(HAVE_NDBM_H)
+ #include <ndbm.h>
+ #if defined(PYOS_OS2) && !defined(PYCC_GCC)
+ static char *which_dbm = "ndbm";
+ #else
+ static char *which_dbm = "GNU gdbm"; /* EMX port of GDBM */
+ #endif
+-#elif defined(HAVE_GDBM_NDBM_H)
+-#include <gdbm/ndbm.h>
+-static char *which_dbm = "GNU gdbm";
+-#elif defined(HAVE_BERKDB_H)
+-#include <db.h>
+-static char *which_dbm = "Berkeley DB";
+-#else
+-#error "No ndbm.h available!"
+-#endif
+
+ typedef struct {
+ PyObject_HEAD
+diff -urN Python-3.0a1.org/setup.py Python-3.0a1/setup.py
+--- Python-3.0a1.org/setup.py 2007-08-29 00:24:48.000000000 +0200
++++ Python-3.0a1/setup.py 2007-09-02 20:09:34.579833964 +0200
+@@ -869,30 +869,8 @@
+
+ # The standard Unix dbm module:
+ if platform not in ['cygwin']:
+- if find_file("ndbm.h", inc_dirs, []) is not None:
+- # Some systems have -lndbm, others don't
+- if self.compiler.find_library_file(lib_dirs, 'ndbm'):
+- ndbm_libs = ['ndbm']
+- else:
+- ndbm_libs = []
+- exts.append( Extension('dbm', ['dbmmodule.c'],
+- define_macros=[('HAVE_NDBM_H',None)],
+- libraries = ndbm_libs ) )
+- elif (self.compiler.find_library_file(lib_dirs, 'gdbm')
+- and find_file("gdbm/ndbm.h", inc_dirs, []) is not None):
+- exts.append( Extension('dbm', ['dbmmodule.c'],
+- define_macros=[('HAVE_GDBM_NDBM_H',None)],
+- libraries = ['gdbm'] ) )
+- elif db_incs is not None:
+- exts.append( Extension('dbm', ['dbmmodule.c'],
+- library_dirs=dblib_dir,
+- runtime_library_dirs=dblib_dir,
+- include_dirs=db_incs,
+- define_macros=[('HAVE_BERKDB_H',None),
+- ('DB_DBM_HSEARCH',None)],
+- libraries=dblibs))
+- else:
+- missing.append('dbm')
++ exts.append( Extension('dbm', ['dbmmodule.c'],
++ libraries = ['gdbm', 'gdbm_compat'] ) )
+
+ # Anthony Baxter's gdbm module. GNU dbm(3) will require -lgdbm:
+ if (self.compiler.find_library_file(lib_dirs, 'gdbm')):
--- /dev/null
+diff -Nur Python-2.5.orig/Lib/distutils/command/install.py Python-2.5/Lib/distutils/command/install.py
+--- Python-2.5.orig/Lib/distutils/command/install.py 2007-03-17 16:26:13.803357750 +0000
++++ Python-2.5/Lib/distutils/command/install.py 2007-03-17 16:26:50.821671250 +0000
+@@ -40,14 +40,14 @@
+
+ INSTALL_SCHEMES = {
+ 'unix_prefix': {
+- 'purelib': '$base/lib/python$py_version_short/site-packages',
++ 'purelib': '$base/share/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',
++ 'purelib': '$base/share/python',
+ 'platlib': '$base/'+libname+'/python',
+ 'headers': '$base/include/python/$dist_name',
+ 'scripts': '$base/bin',
+diff -Nur Python-2.5.orig/Lib/distutils/sysconfig.py Python-2.5/Lib/distutils/sysconfig.py
+--- Python-2.5.orig/Lib/distutils/sysconfig.py 2007-03-17 16:26:13.803357750 +0000
++++ Python-2.5/Lib/distutils/sysconfig.py 2007-03-17 16:26:50.821671250 +0000
+@@ -99,12 +99,12 @@
+ prefix = plat_specific and EXEC_PREFIX or PREFIX
+
+ if os.name == "posix":
+- if plat_specific:
+- lib = sys.lib
++ if plat_specific:
++ libpython = os.path.join(prefix,
++ sys.lib, "python" + get_python_version())
+ else:
+- lib = 'lib'
+- libpython = os.path.join(prefix,
+- lib, "python" + get_python_version())
++ libpython = os.path.join(prefix,
++ "share", "python" + get_python_version())
+ if standard_lib:
+ return libpython
+ else:
+diff -Nur Python-2.5.orig/Lib/site.py Python-2.5/Lib/site.py
+--- Python-2.5.orig/Lib/site.py 2007-03-17 16:26:13.803357750 +0000
++++ Python-2.5/Lib/site.py 2007-03-17 16:26:50.825671500 +0000
+@@ -185,13 +185,12 @@
+ sys.lib,
+ "python" + sys.version[:3],
+ "site-packages"),
+- 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"))
++ os.path.join(prefix, sys.lib, "site-python"),
++ os.path.join(prefix,
++ "share",
++ "python" + sys.version[:3],
++ "site-packages"),
++ os.path.join(prefix, "share", "site-python")]
+ else:
+ sitedirs = [prefix, os.path.join(prefix, sys.lib, "site-packages")]
+ if sys.platform == 'darwin':
+diff -Nur Python-2.5.orig/Makefile.pre.in Python-2.5/Makefile.pre.in
+--- Python-2.5.orig/Makefile.pre.in 2007-03-17 16:26:13.807358000 +0000
++++ Python-2.5/Makefile.pre.in 2007-03-17 16:26:50.821671250 +0000
+@@ -90,7 +90,7 @@
+ MANDIR= @mandir@
+ INCLUDEDIR= @includedir@
+ CONFINCLUDEDIR= $(exec_prefix)/include
+-SCRIPTDIR= $(prefix)/$(LIB)
++SCRIPTDIR= $(prefix)/share
+
+ # Detailed destination directories
+ BINLIBDEST= $(LIBDIR)/python$(VERSION)
+diff -Nur Python-2.5.orig/Modules/getpath.c Python-2.5/Modules/getpath.c
+--- Python-2.5.orig/Modules/getpath.c 2007-03-17 16:26:13.807358000 +0000
++++ Python-2.5/Modules/getpath.c 2007-03-17 16:26:50.825671500 +0000
+@@ -126,7 +126,8 @@
+
+ #ifndef PYTHONPATH
+ #define PYTHONPATH PREFIX "/" LIB_PYTHON VERSION ":" \
+- EXEC_PREFIX "/" LIB_PYTHON VERSION "/lib-dynload:"
++ EXEC_PREFIX "/" LIB_PYTHON VERSION "/lib-dynload:" \
++ PREFIX "/share/python" VERSION
+ #endif
+
+ #ifndef LANDMARK
+@@ -137,7 +138,8 @@
+ 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 share_python[] = "share/python" VERSION;
+
+ static void
+ reduce(char *dir)
+@@ -275,7 +277,7 @@
+ delim = strchr(prefix, DELIM);
+ if (delim)
+ *delim = '\0';
+- joinpath(prefix, lib_python);
++ joinpath(prefix, share_python);
+ joinpath(prefix, LANDMARK);
+ return 1;
+ }
+@@ -298,7 +300,7 @@
+ copy_absolute(prefix, argv0_path);
+ do {
+ n = strlen(prefix);
+- joinpath(prefix, lib_python);
++ joinpath(prefix, share_python);
+ joinpath(prefix, LANDMARK);
+ if (ismodule(prefix))
+ return 1;
+@@ -308,7 +310,7 @@
+
+ /* Look at configure's PREFIX */
+ strncpy(prefix, PREFIX, MAXPATHLEN);
+- joinpath(prefix, lib_python);
++ joinpath(prefix, share_python);
+ joinpath(prefix, LANDMARK);
+ if (ismodule(prefix))
+ return 1;
+@@ -519,7 +521,7 @@
+ fprintf(stderr,
+ "Could not find platform independent libraries <prefix>\n");
+ strncpy(prefix, PREFIX, MAXPATHLEN);
+- joinpath(prefix, lib_python);
++ joinpath(prefix, share_python);
+ }
+ else
+ reduce(prefix);
+@@ -532,7 +534,7 @@
+ }
+ else
+ strncpy(zip_path, PREFIX, MAXPATHLEN);
+- joinpath(zip_path, "lib/python00.zip");
++ joinpath(zip_path, LIB_PYTHON "00.zip");
+ bufsz = strlen(zip_path); /* Replace "00" with version */
+ zip_path[bufsz - 6] = VERSION[0];
+ zip_path[bufsz - 5] = VERSION[2];
--- /dev/null
+diff -urN Python-3.0a1.org/Demo/cgi/cgi1.py Python-3.0a1/Demo/cgi/cgi1.py
+--- Python-3.0a1.org/Demo/cgi/cgi1.py 2007-07-17 23:03:42.000000000 +0200
++++ Python-3.0a1/Demo/cgi/cgi1.py 2007-09-02 19:56:49.628497973 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/python
++#!/usr/bin/python
+
+ """CGI test 1 - check server setup."""
+
+diff -urN Python-3.0a1.org/Demo/cgi/cgi2.py Python-3.0a1/Demo/cgi/cgi2.py
+--- Python-3.0a1.org/Demo/cgi/cgi2.py 2007-08-06 23:21:05.000000000 +0200
++++ Python-3.0a1/Demo/cgi/cgi2.py 2007-09-02 19:56:49.628497973 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/python
++#!/usr/bin/python
+
+ """CGI test 2 - basic use of cgi module."""
+
+diff -urN Python-3.0a1.org/Demo/cgi/cgi3.py Python-3.0a1/Demo/cgi/cgi3.py
+--- Python-3.0a1.org/Demo/cgi/cgi3.py 2006-10-25 00:26:30.000000000 +0200
++++ Python-3.0a1/Demo/cgi/cgi3.py 2007-09-02 19:56:49.632498200 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/python
++#!/usr/bin/python
+
+ """CGI test 3 (persistent data)."""
+
+diff -urN Python-3.0a1.org/Demo/tix/INSTALL.txt Python-3.0a1/Demo/tix/INSTALL.txt
+--- Python-3.0a1.org/Demo/tix/INSTALL.txt 2006-10-25 00:26:31.000000000 +0200
++++ Python-3.0a1/Demo/tix/INSTALL.txt 2007-09-02 19:56:49.636498427 +0200
+@@ -71,7 +71,7 @@
+ You should now have a working Tix implementation in Python. To see if all
+ is as it should be, run the 'tixwidgets.py' script in the Demo/tix directory.
+ Under X windows, do
+- /usr/local/bin/python Demo/tix/tixwidgets.py
++ /usr/bin/python Demo/tix/tixwidgets.py
+
+ If this does not work, you may need to tell python where to find
+ the Tcl, Tk and Tix library files. This is done by setting the
+@@ -80,7 +80,7 @@
+ env TCL_LIBRARY=/usr/local/lib/tcl8.3 \
+ TK_LIBRARY=/usr/local/lib/tk8.3 \
+ TIX_LIBRARY=/usr/local/lib/tix8.1 \
+- /usr/local/bin/python Demo/tix/tixwidgets.py
++ /usr/bin/python Demo/tix/tixwidgets.py
+
+
+ If you find any bugs or have suggestions for improvement, please report them
+diff -urN Python-3.0a1.org/Doc/c-api/init.rst Python-3.0a1/Doc/c-api/init.rst
+--- Python-3.0a1.org/Doc/c-api/init.rst 2007-08-17 02:23:32.000000000 +0200
++++ Python-3.0a1/Doc/c-api/init.rst 2007-09-02 19:56:49.928514996 +0200
+@@ -195,7 +195,7 @@
+ Return the *prefix* for installed platform-independent files. This is derived
+ through a number of complicated rules from the program name set with
+ :cfunc:`Py_SetProgramName` and some environment variables; for example, if the
+- program name is ``'/usr/local/bin/python'``, the prefix is ``'/usr/local'``. The
++ program name is ``'/usr/bin/python'``, the prefix is ``'/usr/local'``. The
+ returned string points into static storage; the caller should not modify its
+ value. This corresponds to the :makevar:`prefix` variable in the top-level
+ :file:`Makefile` and the :option:`--prefix` argument to the :program:`configure`
+@@ -208,7 +208,7 @@
+ Return the *exec-prefix* for installed platform-*dependent* files. This is
+ derived through a number of complicated rules from the program name set with
+ :cfunc:`Py_SetProgramName` and some environment variables; for example, if the
+- program name is ``'/usr/local/bin/python'``, the exec-prefix is
++ program name is ``'/usr/bin/python'``, the exec-prefix is
+ ``'/usr/local'``. The returned string points into static storage; the caller
+ should not modify its value. This corresponds to the :makevar:`exec_prefix`
+ variable in the top-level :file:`Makefile` and the :option:`--exec-prefix`
+diff -urN Python-3.0a1.org/Doc/c-api/intro.rst Python-3.0a1/Doc/c-api/intro.rst
+--- Python-3.0a1.org/Doc/c-api/intro.rst 2007-08-17 02:23:32.000000000 +0200
++++ Python-3.0a1/Doc/c-api/intro.rst 2007-09-02 19:56:49.920514542 +0200
+@@ -536,7 +536,7 @@
+ path (the environment variable :envvar:`PATH`).
+
+ For instance, if the Python executable is found in
+-:file:`/usr/local/bin/python`, it will assume that the libraries are in
++:file:`/usr/bin/python`, it will assume that the libraries are in
+ :file:`/usr/local/lib/python{X.Y}`. (In fact, this particular path is also
+ the "fallback" location, used when no executable file named :file:`python` is
+ found along :envvar:`PATH`.) The user can override this behavior by setting the
+diff -urN Python-3.0a1.org/Doc/install/index.rst Python-3.0a1/Doc/install/index.rst
+--- Python-3.0a1.org/Doc/install/index.rst 2007-08-29 00:24:47.000000000 +0200
++++ Python-3.0a1/Doc/install/index.rst 2007-09-02 19:56:49.956516585 +0200
+@@ -370,12 +370,12 @@
+
+ Another possibility is a network filesystem where the name used to write to a
+ remote directory is different from the name used to read it: for example, the
+-Python interpreter accessed as :file:`/usr/local/bin/python` might search for
++Python interpreter accessed as :file:`/usr/bin/python` might search for
+ modules in :file:`/usr/local/lib/python2.{X}`, but those modules would have to
+ be installed to, say, :file:`/mnt/{@server}/export/lib/python2.{X}`. This could
+ be done with ::
+
+- /usr/local/bin/python setup.py install --prefix=/mnt/@server/export
++ /usr/bin/python setup.py install --prefix=/mnt/@server/export
+
+ In either case, the :option:`--prefix` option defines the installation base, and
+ the :option:`--exec-prefix` option defines the platform-specific installation
+diff -urN Python-3.0a1.org/Doc/library/cgi.rst Python-3.0a1/Doc/library/cgi.rst
+--- Python-3.0a1.org/Doc/library/cgi.rst 2007-08-17 02:23:42.000000000 +0200
++++ Python-3.0a1/Doc/library/cgi.rst 2007-09-02 19:56:49.936515450 +0200
+@@ -409,7 +409,7 @@
+ first line of the script contains ``#!`` starting in column 1 followed by the
+ pathname of the Python interpreter, for instance::
+
+- #!/usr/local/bin/python
++ #!/usr/bin/python
+
+ Make sure the Python interpreter exists and is executable by "others".
+
+diff -urN Python-3.0a1.org/Doc/library/pickle.rst Python-3.0a1/Doc/library/pickle.rst
+--- Python-3.0a1.org/Doc/library/pickle.rst 2007-08-17 02:23:42.000000000 +0200
++++ Python-3.0a1/Doc/library/pickle.rst 2007-09-02 19:56:49.944515904 +0200
+@@ -717,7 +717,7 @@
+ reading resumes from the last location. The :meth:`__setstate__` and
+ :meth:`__getstate__` methods are used to implement this behavior. ::
+
+- #!/usr/local/bin/python
++ #!/usr/bin/python
+
+ class TextReader:
+ """Print and number lines in a text file."""
+@@ -754,7 +754,7 @@
+ >>> import TextReader
+ >>> obj = TextReader.TextReader("TextReader.py")
+ >>> obj.readline()
+- '1: #!/usr/local/bin/python'
++ '1: #!/usr/bin/python'
+ >>> obj.readline()
+ '2: '
+ >>> obj.readline()
+diff -urN Python-3.0a1.org/Doc/tutorial/interpreter.rst Python-3.0a1/Doc/tutorial/interpreter.rst
+--- Python-3.0a1.org/Doc/tutorial/interpreter.rst 2007-08-17 02:23:34.000000000 +0200
++++ Python-3.0a1/Doc/tutorial/interpreter.rst 2007-09-02 19:56:49.932515223 +0200
+@@ -10,7 +10,7 @@
+ Invoking the Interpreter
+ ========================
+
+-The Python interpreter is usually installed as :file:`/usr/local/bin/python` on
++The Python interpreter is usually installed as :file:`/usr/bin/python` on
+ those machines where it is available; putting :file:`/usr/local/bin` in your
+ Unix shell's search path makes it possible to start it by typing the command ::
+
+diff -urN Python-3.0a1.org/Lib/cgi.py Python-3.0a1/Lib/cgi.py
+--- Python-3.0a1.org/Lib/cgi.py 2007-08-31 01:06:20.000000000 +0200
++++ Python-3.0a1/Lib/cgi.py 2007-09-02 19:56:49.968517266 +0200
+@@ -1,6 +1,6 @@
+-#! /usr/local/bin/python
++#! /usr/bin/python
+
+-# NOTE: the above "/usr/local/bin/python" is NOT a mistake. It is
++# NOTE: the above "/usr/bin/python" is NOT a mistake. It is
+ # intentionally NOT "/usr/bin/env python". On many systems
+ # (e.g. Solaris), /usr/local/bin is not in $PATH as passed to CGI
+ # scripts, and /usr/local/bin is the default directory where Python is
+diff -urN Python-3.0a1.org/Mac/PythonLauncher/factorySettings.plist Python-3.0a1/Mac/PythonLauncher/factorySettings.plist
+--- Python-3.0a1.org/Mac/PythonLauncher/factorySettings.plist 2006-10-25 00:26:37.000000000 +0200
++++ Python-3.0a1/Mac/PythonLauncher/factorySettings.plist 2007-09-02 19:56:49.880512272 +0200
+@@ -10,7 +10,7 @@
+ <false/>
+ <key>interpreter_list</key>
+ <array>
+- <string>/usr/local/bin/pythonw</string>
++ <string>/usr/bin/pythonw</string>
+ <string>/usr/bin/pythonw</string>
+ <string>/sw/bin/pythonw</string>
+ </array>
+@@ -35,8 +35,8 @@
+ <false/>
+ <key>interpreter_list</key>
+ <array>
+- <string>/usr/local/bin/pythonw</string>
+- <string>/usr/local/bin/python</string>
++ <string>/usr/bin/pythonw</string>
++ <string>/usr/bin/python</string>
+ <string>/usr/bin/pythonw</string>
+ <string>/usr/bin/python</string>
+ <string>/sw/bin/pythonw</string>
+@@ -63,8 +63,8 @@
+ <false/>
+ <key>interpreter_list</key>
+ <array>
+- <string>/usr/local/bin/pythonw</string>
+- <string>/usr/local/bin/python</string>
++ <string>/usr/bin/pythonw</string>
++ <string>/usr/bin/python</string>
+ <string>/usr/bin/pythonw</string>
+ <string>/usr/bin/python</string>
+ <string>/sw/bin/pythonw</string>
+diff -urN Python-3.0a1.org/Mac/README Python-3.0a1/Mac/README
+--- Python-3.0a1.org/Mac/README 2006-12-13 15:07:43.000000000 +0100
++++ Python-3.0a1/Mac/README 2007-09-02 19:56:49.896513180 +0200
+@@ -128,7 +128,7 @@
+ to be supplied later. Some useful (but outdated) info can be found in
+ Mac/Demo.
+
+-The commandline scripts /usr/local/bin/python and pythonw can be used to run
++The commandline scripts /usr/bin/python and pythonw can be used to run
+ non-GUI and GUI python scripts from the command line, respectively.
+
+ How do I create a binary distribution?
+diff -urN Python-3.0a1.org/Mac/Resources/app/Resources/English.lproj/Documentation/shell.html Python-3.0a1/Mac/Resources/app/Resources/English.lproj/Documentation/shell.html
+--- Python-3.0a1.org/Mac/Resources/app/Resources/English.lproj/Documentation/shell.html 2006-10-25 00:26:42.000000000 +0200
++++ Python-3.0a1/Mac/Resources/app/Resources/English.lproj/Documentation/shell.html 2007-09-02 19:56:49.892512953 +0200
+@@ -17,7 +17,7 @@
+ </td>
+ <td>
+ <p>MacPython 2.3 installs a perfectly normal Unix commandline
+- python interpreter in <tt>/usr/local/bin/python</tt>. As of Mac OS X 10.2, however,
++ python interpreter in <tt>/usr/bin/python</tt>. As of Mac OS X 10.2, however,
+ <tt>/usr/local/bin</tt> is not on the search path of your shell. Moreover,
+ Apple's python 2.2, which lives in <tt>/usr/bin</tt> <em>is</em> on your
+ search path, so this can lead to confusion.</p>
+diff -urN Python-3.0a1.org/Mac/scripts/zappycfiles.py Python-3.0a1/Mac/scripts/zappycfiles.py
+--- Python-3.0a1.org/Mac/scripts/zappycfiles.py 2007-08-31 01:06:18.000000000 +0200
++++ Python-3.0a1/Mac/scripts/zappycfiles.py 2007-09-02 19:56:49.892512953 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/python
++#!/usr/bin/python
+ """Recursively zap all .pyc and .pyo files"""
+ import os
+ import sys
+diff -urN Python-3.0a1.org/Misc/HISTORY Python-3.0a1/Misc/HISTORY
+--- Python-3.0a1.org/Misc/HISTORY 2007-08-16 18:30:26.000000000 +0200
++++ Python-3.0a1/Misc/HISTORY 2007-09-02 19:56:49.872511818 +0200
+@@ -11092,9 +11092,9 @@
+ were invoked.
+
+ - It is now recommended to use ``#!/usr/bin/env python'' instead of
+-``#!/usr/local/bin/python'' at the start of executable scripts, except
++``#!/usr/bin/python'' at the start of executable scripts, except
+ for CGI scripts. It has been determined that the use of /usr/bin/env
+-is more portable than that of /usr/local/bin/python -- scripts almost
++is more portable than that of /usr/bin/python -- scripts almost
+ never have to be edited when the Python interpreter lives in a
+ non-standard place. Note that this doesn't work for CGI scripts since
+ the python executable often doesn't live in the HTTP server's default
+@@ -14379,7 +14379,7 @@
+ Python exits or receives a SIGTERM or SIGHUP signal.
+
+ The interpreter is now generally assumed to live in
+-/usr/local/bin/python (as opposed to /usr/local/python). The script
++/usr/bin/python (as opposed to /usr/local/python). The script
+ demo/scripts/fixps.py will update old scripts in place (you can easily
+ modify it to do other similar changes).
+
+diff -urN Python-3.0a1.org/Misc/RPM/python-2.6.spec Python-3.0a1/Misc/RPM/python-2.6.spec
+--- Python-3.0a1.org/Misc/RPM/python-2.6.spec 2006-10-25 00:26:34.000000000 +0200
++++ Python-3.0a1/Misc/RPM/python-2.6.spec 2007-09-02 19:56:49.676500697 +0200
+@@ -150,10 +150,10 @@
+
+ * Sat Mar 27 2004 Sean Reifschneider <jafo-rpms@tummy.com> [2.3.2-3pydotorg]
+ - Being more agressive about finding the paths to fix for
+- #!/usr/local/bin/python.
++ #!/usr/bin/python.
+
+ * Sat Feb 07 2004 Sean Reifschneider <jafo-rpms@tummy.com> [2.3.3-2pydotorg]
+-- Adding code to remove "#!/usr/local/bin/python" from particular files and
++- Adding code to remove "#!/usr/bin/python" from particular files and
+ causing the RPM build to terminate if there are any unexpected files
+ which have that line in them.
+
+@@ -296,7 +296,7 @@
+
+ # fix the #! line in installed files
+ find "$RPM_BUILD_ROOT" -type f -print0 |
+- xargs -0 grep -l /usr/local/bin/python | while read file
++ xargs -0 grep -l /usr/bin/python | while read file
+ do
+ FIXFILE="$file"
+ sed 's|^#!.*python|#!%{__prefix}/bin/env python'"%{binsuffix}"'|' \
+@@ -306,7 +306,7 @@
+ done
+
+ # check to see if there are any straggling #! lines
+-find "$RPM_BUILD_ROOT" -type f | xargs egrep -n '^#! */usr/local/bin/python' \
++find "$RPM_BUILD_ROOT" -type f | xargs egrep -n '^#! */usr/bin/python' \
+ | grep ':1:#!' >/tmp/python-rpm-files.$$ || true
+ if [ -s /tmp/python-rpm-files.$$ ]
+ then
+@@ -314,7 +314,7 @@
+ cat /tmp/python-rpm-files.$$
+ cat <<@EOF
+ *****************************************************
+- There are still files referencing /usr/local/bin/python in the
++ There are still files referencing /usr/bin/python in the
+ install directory. They are listed above. Please fix the .spec
+ file and try again. If you are an end-user, you probably want
+ to report this to jafo-rpms@tummy.com as well.
+diff -urN Python-3.0a1.org/Tools/faqwiz/faqw.py Python-3.0a1/Tools/faqwiz/faqw.py
+--- Python-3.0a1.org/Tools/faqwiz/faqw.py 2007-08-03 22:42:22.000000000 +0200
++++ Python-3.0a1/Tools/faqwiz/faqw.py 2007-09-02 19:56:49.916514315 +0200
+@@ -1,4 +1,4 @@
+-#! /usr/local/bin/python
++#! /usr/bin/python
+
+ """FAQ wizard bootstrap."""
+
+@@ -10,7 +10,7 @@
+ # executable.
+
+ # You need to edit the first line and the lines that define FAQDIR and
+-# SRCDIR, below: change /usr/local/bin/python to where your Python
++# SRCDIR, below: change /usr/bin/python to where your Python
+ # interpreter lives, change the value for FAQDIR to where your FAQ
+ # lives, and change the value for SRCDIR to where your faqwiz.py
+ # module lives. The faqconf.py and faqcust.py files live there, too.
+diff -urN Python-3.0a1.org/Tools/pybench/pybench.py Python-3.0a1/Tools/pybench/pybench.py
+--- Python-3.0a1.org/Tools/pybench/pybench.py 2007-08-03 22:42:22.000000000 +0200
++++ Python-3.0a1/Tools/pybench/pybench.py 2007-09-02 19:56:49.908513861 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/python -O
++#!/usr/bin/python -O
+
+ """ A Python Benchmark Suite
+
+diff -urN Python-3.0a1.org/Tools/pybench/README Python-3.0a1/Tools/pybench/README
+--- Python-3.0a1.org/Tools/pybench/README 2006-10-25 00:26:47.000000000 +0200
++++ Python-3.0a1/Tools/pybench/README 2007-09-02 19:56:49.912514088 +0200
+@@ -141,7 +141,7 @@
+ Processor: x86_64
+
+ Python:
+- Executable: /usr/local/bin/python
++ Executable: /usr/bin/python
+ Version: 2.4.2
+ Compiler: GCC 3.3.4 (pre 3.3.5 20040809)
+ Bits: 64bit
+diff -urN Python-3.0a1.org/Tools/scripts/fixps.py Python-3.0a1/Tools/scripts/fixps.py
+--- Python-3.0a1.org/Tools/scripts/fixps.py 2007-08-03 22:42:22.000000000 +0200
++++ Python-3.0a1/Tools/scripts/fixps.py 2007-09-02 19:56:49.900513407 +0200
+@@ -15,13 +15,13 @@
+ print(filename, ': can\'t open :', msg)
+ continue
+ line = f.readline()
+- if not re.match('^#! */usr/local/bin/python', line):
+- print(filename, ': not a /usr/local/bin/python script')
++ if not re.match('^#! */usr/bin/python', line):
++ print(filename, ': not a /usr/bin/python script')
+ f.close()
+ continue
+ rest = f.read()
+ f.close()
+- line = re.sub('/usr/local/bin/python',
++ line = re.sub('/usr/bin/python',
+ '/usr/bin/env python', line)
+ print(filename, ':', repr(line))
+ f = open(filename, "w")
+diff -urN Python-3.0a1.org/Tools/scripts/parseentities.py Python-3.0a1/Tools/scripts/parseentities.py
+--- Python-3.0a1.org/Tools/scripts/parseentities.py 2006-10-25 00:26:46.000000000 +0200
++++ Python-3.0a1/Tools/scripts/parseentities.py 2007-09-02 19:56:49.896513180 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/python
++#!/usr/bin/python
+ """ Utility for parsing HTML entity definitions available from:
+
+ http://www.w3.org/ as e.g.
+diff -urN Python-3.0a1.org/Tools/scripts/README Python-3.0a1/Tools/scripts/README
+--- Python-3.0a1.org/Tools/scripts/README 2006-10-25 00:26:46.000000000 +0200
++++ Python-3.0a1/Tools/scripts/README 2007-09-02 19:56:49.904513634 +0200
+@@ -45,7 +45,7 @@
+ nm2def.py Create a template for PC/python_nt.def (Marc Lemburg)
+ objgraph.py Print object graph from nm output on a library
+ parseentities.py Utility for parsing HTML entity definitions
+-pathfix.py Change #!/usr/local/bin/python into something else
++pathfix.py Change #!/usr/bin/python into something else
+ pdeps.py Print dependencies between Python modules
+ pickle2db.py Load a pickle generated by db2pickle.py to a database
+ pindent.py Indent Python code, giving block-closing comments
projects / packages / python3.git / commitdiff