diff -ru Python-2.1.3/configure Python-2.1.3-patched/configure
--- Python-2.1.3/configure	Mon Jul 16 18:07:26 2001
+++ Python-2.1.3-patched/configure	Fri Sep 21 13:09:04 2001
@@ -2944,7 +2944,7 @@
 	DYNIX/ptx*) LDSHARED="ld -G";;
         Darwin/*|next/*) 
 		if test "$ns_dyld"
-		then LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined suppress'
+		then LDSHARED='$(CC) $(LDFLAGS) -bundle -flat_namespace -undefined suppress'
 		else LDSHARED='$(CC) $(CFLAGS) -nostdlib -r';
 		fi
 	if test "$with_next_framework" ; then
diff -ru Python-2.1.3/Modules/Setup.dist Python-2.1.3/Modules/Setup.dist
--- Python-2.1.3/Modules/Setup.dist	Thu Mar 22 23:18:55 2001
+++ Python-2.1.3/Modules/Setup.dist	Fri Sep 21 13:07:39 2001
@@ -135,7 +135,7 @@
 # it, depending on your system -- see the GNU readline instructions.
 # It's okay for this to be a shared library, too.
 
-#readline readline.c -lreadline -ltermcap
+readline readline.c -lreadline 
 
 
 # Modules that should always be present (non UNIX dependent):
@@ -298,13 +298,13 @@
 # every system.
 
 # *** Always uncomment this (leave the leading underscore in!):
-# _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \
+ _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \
 # *** Uncomment and edit to reflect where your Tcl/Tk libraries are:
 #	-L/usr/local/lib \
 # *** Uncomment and edit to reflect where your Tcl/Tk headers are:
 #	-I/usr/local/include \
 # *** Uncomment and edit to reflect where your X11 header files are:
-#	-I/usr/X11R6/include \
+	-I/usr/X11R6/include \
 # *** Or uncomment this for Solaris:
 #	-I/usr/openwin/include \
 # *** Uncomment and edit for Tix extension only:
@@ -317,17 +317,17 @@
 # *** Uncomment and edit for TOGL extension only:
 #	-DWITH_TOGL togl.c \
 # *** Uncomment and edit to reflect your Tcl/Tk versions:
-#	-ltk8.2 -ltcl8.2 \
+	-ltk -ltcl \
 # *** Uncomment and edit to reflect where your X11 libraries are:
-#	-L/usr/X11R6/lib \
+	-L/usr/X11R6/lib \
 # *** Or uncomment this for Solaris:
 #	-L/usr/openwin/lib \
 # *** Uncomment these for TOGL extension only:
-#	-lGL -lGLU -lXext -lXmu \
+#	-lGL -lGLU -lXext -lXmu \
 # *** Uncomment for AIX:
 #	-lld \
 # *** Always uncomment this; X11 libraries to link with:
-#	-lX11
+	-lX11
 
 # Lance Ellinghaus's modules:
 
@@ -342,9 +342,9 @@
 #
 # First, look at Setup.config; configure may have set this for you.
 
-#_curses _cursesmodule.c -lcurses -ltermcap
+#_curses _cursesmodule.c -lncurses 
 # Wrapper for the panel library that's part of ncurses and SYSV curses.
-#_curses_panel _curses_panel.c -lpanel -lncurses 
+#_curses_panel _curses_panel.c -lpanel -lncurses 
 
 
 # Tommy Burnette's 'new' module (creates new empty objects of certain kinds):
@@ -436,7 +436,7 @@
 # Andrew Kuchling's zlib module.
 # This require zlib 1.1.3 (or later).
 # See http://www.cdrom.com/pub/infozip/zlib/
-#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
+zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
 
 # Interface to the Expat XML parser
 #
diff -ru Python-2.1.3/Makefile.pre.in Python-2.1.3-patched/Makefile.pre.in
--- Python-2.1.3/Makefile.pre.in	Thu Jul 19 15:21:05 2001
+++ Python-2.1.3-patched/Makefile.pre.in	Fri Sep 21 13:07:39 2001
@@ -55,7 +55,7 @@
 # Compiler options
 OPT=		@OPT@
 DEFS=		@DEFS@
-CFLAGS=		$(OPT) -I. -I$(srcdir)/Include $(DEFS)
+CFLAGS=		$(OPT) -I. -I$(srcdir)/Include -I<PREFIX>/include $(DEFS)
 LDFLAGS=	@LDFLAGS@
 LDLAST=		@LDLAST@
 SGI_ABI=	@SGI_ABI@
@@ -386,7 +386,7 @@
 		-$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
 
 $(PGEN):	$(PGENOBJS)
-		$(CC) $(OPT) $(PGENOBJS) $(LIBS) -o $(PGEN)
+		$(CC) $(OPT) $(PGENOBJS) $(LDFLAGS) $(LIBS) -o $(PGEN)
 
 Parser/grammar.o:	$(srcdir)/Parser/grammar.c \
 				$(srcdir)/Parser/assert.h \
--- Python-2.1.3/Lib/distutils/util.py.orig	Sun Feb 24 17:35:00 2002
+++ Python-2.1.3/Lib/distutils/util.py	Sun Feb 24 06:39:44 2002
@@ -41,6 +41,8 @@
     # Try to distinguish various flavours of Unix
 
     (osname, host, release, version, machine) = os.uname()
+    if machine == "Power Macintosh":
+       machine = "PowerMacintosh"
 
     # Convert the OS name to lowercase and remove '/' characters
     # (to accommodate BSD/OS)
--- Python-2.1.3/setup.py.orig	Thu Apr 25 14:57:58 2002
+++ Python-2.1.3/setup.py	Thu Apr 25 14:59:13 2002
@@ -150,6 +150,10 @@
             self.compiler.library_dirs.insert(0, '/usr/local/lib')
         if '/usr/local/include' not in self.compiler.include_dirs:
             self.compiler.include_dirs.insert(0, '/usr/local/include' )
+        if '<PREFIX>/lib' not in self.compiler.library_dirs:
+            self.compiler.library_dirs.insert(0, '<PREFIX>/lib')
+        if '<PREFIX>/include' not in self.compiler.include_dirs:
+            self.compiler.include_dirs.insert(0, '<PREFIX>/include' )
 
         # lib_dirs and inc_dirs are used to search for files;
         # if a file is found in one of those directories, it can