--- Makefile.pre.in.orig	2009-12-19 15:41:08 -0800
+++ Makefile.pre.in	2009-12-19 15:42:45 -0800
@@ -170,7 +170,7 @@
 DLINCLDIR=	@DLINCLDIR@
 DYNLOADFILE=	@DYNLOADFILE@
 MACHDEP_OBJS=	@MACHDEP_OBJS@
-LIBOBJDIR=	Python/
+LIBOBJDIR=	Python.dir/
 LIBOBJS=	@LIBOBJS@
 UNICODE_OBJS=   @UNICODE_OBJS@
 
@@ -199,7 +199,7 @@
 ##########################################################################
 # Grammar
 GRAMMAR_H=	$(srcdir)/Include/graminit.h
-GRAMMAR_C=	$(srcdir)/Python/graminit.c
+GRAMMAR_C=	$(srcdir)/Python.dir/graminit.c
 GRAMMAR_INPUT=	$(srcdir)/Grammar/Grammar
 
 
@@ -226,7 +226,7 @@
 
 PGOBJS=		\
 		Objects/obmalloc.o \
-		Python/mysnprintf.o \
+		Python.dir/mysnprintf.o \
 		Parser/tokenizer_pgen.o \
 		Parser/printgrammar.o \
 		Parser/pgenmain.o
@@ -241,7 +241,7 @@
 # AST
 AST_H_DIR=	$(srcdir)/Include
 AST_H=		$(AST_H_DIR)/Python-ast.h
-AST_C_DIR=	$(srcdir)/Python
+AST_C_DIR=	$(srcdir)/Python.dir
 AST_C=		$(AST_C_DIR)/Python-ast.c
 AST_ASDL=	$(srcdir)/Parser/Python.asdl
 
@@ -252,47 +252,47 @@
 ##########################################################################
 # Python
 PYTHON_OBJS=	\
-		Python/_warnings.o \
-		Python/Python-ast.o \
-		Python/asdl.o \
-		Python/ast.o \
-		Python/bltinmodule.o \
-		Python/ceval.o \
-		Python/compile.o \
-		Python/codecs.o \
-		Python/errors.o \
-		Python/frozen.o \
-		Python/frozenmain.o \
-		Python/future.o \
-		Python/getargs.o \
-		Python/getcompiler.o \
-		Python/getcopyright.o \
-		Python/getmtime.o \
-		Python/getplatform.o \
-		Python/getversion.o \
-		Python/graminit.o \
-		Python/import.o \
-		Python/importdl.o \
-		Python/marshal.o \
-		Python/modsupport.o \
-		Python/mystrtoul.o \
-		Python/mysnprintf.o \
-		Python/peephole.o \
-		Python/pyarena.o \
-		Python/pyfpe.o \
-		Python/pymath.o \
-		Python/pystate.o \
-		Python/pythonrun.o \
-		Python/structmember.o \
-		Python/symtable.o \
-		Python/sysmodule.o \
-		Python/traceback.o \
-		Python/getopt.o \
-		Python/pystrcmp.o \
-		Python/pystrtod.o \
-		Python/formatter_unicode.o \
-		Python/formatter_string.o \
-		Python/$(DYNLOADFILE) \
+		Python.dir/_warnings.o \
+		Python.dir/Python-ast.o \
+		Python.dir/asdl.o \
+		Python.dir/ast.o \
+		Python.dir/bltinmodule.o \
+		Python.dir/ceval.o \
+		Python.dir/compile.o \
+		Python.dir/codecs.o \
+		Python.dir/errors.o \
+		Python.dir/frozen.o \
+		Python.dir/frozenmain.o \
+		Python.dir/future.o \
+		Python.dir/getargs.o \
+		Python.dir/getcompiler.o \
+		Python.dir/getcopyright.o \
+		Python.dir/getmtime.o \
+		Python.dir/getplatform.o \
+		Python.dir/getversion.o \
+		Python.dir/graminit.o \
+		Python.dir/import.o \
+		Python.dir/importdl.o \
+		Python.dir/marshal.o \
+		Python.dir/modsupport.o \
+		Python.dir/mystrtoul.o \
+		Python.dir/mysnprintf.o \
+		Python.dir/peephole.o \
+		Python.dir/pyarena.o \
+		Python.dir/pyfpe.o \
+		Python.dir/pymath.o \
+		Python.dir/pystate.o \
+		Python.dir/pythonrun.o \
+		Python.dir/structmember.o \
+		Python.dir/symtable.o \
+		Python.dir/sysmodule.o \
+		Python.dir/traceback.o \
+		Python.dir/getopt.o \
+		Python.dir/pystrcmp.o \
+		Python.dir/pystrtod.o \
+		Python.dir/formatter_unicode.o \
+		Python.dir/formatter_string.o \
+		Python.dir/$(DYNLOADFILE) \
 		$(LIBOBJS) \
 		$(MACHDEP_OBJS) \
 		$(THREADOBJ)
@@ -548,13 +548,13 @@
 $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES)
 	$(ASDLGEN) -c $(AST_C_DIR) $(AST_ASDL)
 
-Python/compile.o Python/symtable.o: $(GRAMMAR_H) $(AST_H)
+Python.dir/compile.o Python.dir/symtable.o: $(GRAMMAR_H) $(AST_H)
 
-Python/getplatform.o: $(srcdir)/Python/getplatform.c
-		$(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c
+Python.dir/getplatform.o: $(srcdir)/Python.dir/getplatform.c
+		$(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python.dir/getplatform.c
 
-Python/importdl.o: $(srcdir)/Python/importdl.c
-		$(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
+Python.dir/importdl.o: $(srcdir)/Python.dir/importdl.c
+		$(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python.dir/importdl.c
 
 Objects/unicodectype.o:	$(srcdir)/Objects/unicodectype.c \
 				$(srcdir)/Objects/unicodetype_db.h
@@ -582,10 +582,10 @@
 Objects/stringobject.o: $(srcdir)/Objects/stringobject.c \
 				$(STRINGLIB_HEADERS)
 
-Python/formatter_unicode.o: $(srcdir)/Python/formatter_unicode.c \
+Python.dir/formatter_unicode.o: $(srcdir)/Python.dir/formatter_unicode.c \
 				$(STRINGLIB_HEADERS)
 
-Python/formatter_string.o: $(srcdir)/Python/formatter_string.c \
+Python.dir/formatter_string.o: $(srcdir)/Python.dir/formatter_string.c \
 				$(STRINGLIB_HEADERS)
 
 ############################################################################
@@ -1216,7 +1216,7 @@
 
 # Dependencies
 
-Python/thread.o: @THREADHEADERS@
+Python.dir/thread.o: @THREADHEADERS@
 
 # Declare targets that aren't real files
 .PHONY: all build_all sharedmods oldsharedmods test quicktest memtest
--- configure.in.orig	2009-12-19 16:13:57 -0800
+++ configure.in	2009-12-19 16:15:44 -0800
@@ -1566,7 +1566,7 @@
 fi
 case "$enable_toolbox_glue" in
 yes)
-	extra_machdep_objs="Python/mactoolboxglue.o"
+	extra_machdep_objs="Python.dir/mactoolboxglue.o"
 	extra_undefs="-u _PyMac_Error"
 	AC_DEFINE(USE_TOOLBOX_OBJECT_GLUE, 1,
          [Define if you want to use MacPython modules on MacOSX in unix-Python.])
@@ -2061,7 +2061,7 @@
 	SIGNAL_OBJS=""
 else
 	USE_SIGNAL_MODULE="#"
-	SIGNAL_OBJS="Parser/intrcheck.o Python/sigcheck.o"
+	SIGNAL_OBJS="Parser/intrcheck.o Python.dir/sigcheck.o"
 fi
 
 # This is used to generate Setup.config
@@ -2114,7 +2114,7 @@
     # Defining _REENTRANT on system with POSIX threads should not hurt.
     AC_DEFINE(_REENTRANT)
     posix_threads=yes
-    THREADOBJ="Python/thread.o"    
+    THREADOBJ="Python.dir/thread.o"    
 elif test "$ac_cv_kpthread" = "yes"
 then
     CC="$CC -Kpthread"
@@ -2123,7 +2123,7 @@
     fi
     AC_DEFINE(WITH_THREAD)
     posix_threads=yes
-    THREADOBJ="Python/thread.o"
+    THREADOBJ="Python.dir/thread.o"
 elif test "$ac_cv_kthread" = "yes"
 then
     CC="$CC -Kthread"
@@ -2132,7 +2132,7 @@
     fi
     AC_DEFINE(WITH_THREAD)
     posix_threads=yes
-    THREADOBJ="Python/thread.o"
+    THREADOBJ="Python.dir/thread.o"
 elif test "$ac_cv_pthread" = "yes"
 then
     CC="$CC -pthread"
@@ -2141,7 +2141,7 @@
     fi
     AC_DEFINE(WITH_THREAD)
     posix_threads=yes
-    THREADOBJ="Python/thread.o"
+    THREADOBJ="Python.dir/thread.o"
 else
     if test ! -z "$with_threads" -a -d "$with_threads"
     then LDFLAGS="$LDFLAGS -L$with_threads"
@@ -2169,12 +2169,12 @@
     AC_DEFINE(HURD_C_THREADS, 1,
     [Define if you are using Mach cthreads directly under /include])
     LIBS="$LIBS -lthreads"
-    THREADOBJ="Python/thread.o"],[
+    THREADOBJ="Python.dir/thread.o"],[
     AC_CHECK_HEADER(mach/cthreads.h, [AC_DEFINE(WITH_THREAD)
     AC_DEFINE(C_THREADS)
     AC_DEFINE(MACH_C_THREADS, 1,
     [Define if you are using Mach cthreads under mach /])
-    THREADOBJ="Python/thread.o"],[
+    THREADOBJ="Python.dir/thread.o"],[
     AC_MSG_CHECKING(for --with-pth)
     AC_ARG_WITH([pth],
                 AC_HELP_STRING(--with-pth, use GNU pth threading libraries),
@@ -2183,7 +2183,7 @@
                   AC_DEFINE([HAVE_PTH], 1,
                             [Define if you have GNU PTH threads.])
                   LIBS="-lpth $LIBS"
-                  THREADOBJ="Python/thread.o"],
+                  THREADOBJ="Python.dir/thread.o"],
 	        [AC_MSG_RESULT(no)
 
     # Just looking for pthread_create in libpthread is not enough:
@@ -2199,47 +2199,47 @@
     AC_MSG_RESULT(yes)
     AC_DEFINE(WITH_THREAD)
     posix_threads=yes
-    THREADOBJ="Python/thread.o"],[
+    THREADOBJ="Python.dir/thread.o"],[
     LIBS=$_libs
     AC_CHECK_FUNC(pthread_detach, [AC_DEFINE(WITH_THREAD)
     posix_threads=yes
-    THREADOBJ="Python/thread.o"],[
+    THREADOBJ="Python.dir/thread.o"],[
     AC_CHECK_HEADER(atheos/threads.h, [AC_DEFINE(WITH_THREAD)
     AC_DEFINE(ATHEOS_THREADS, 1,
     [Define this if you have AtheOS threads.])
-    THREADOBJ="Python/thread.o"],[
+    THREADOBJ="Python.dir/thread.o"],[
     AC_CHECK_HEADER(kernel/OS.h, [AC_DEFINE(WITH_THREAD)
     AC_DEFINE(BEOS_THREADS, 1,
     [Define this if you have BeOS threads.])
-    THREADOBJ="Python/thread.o"],[
+    THREADOBJ="Python.dir/thread.o"],[
     AC_CHECK_LIB(pthreads, pthread_create, [AC_DEFINE(WITH_THREAD)
     posix_threads=yes
     LIBS="$LIBS -lpthreads"
-    THREADOBJ="Python/thread.o"], [
+    THREADOBJ="Python.dir/thread.o"], [
     AC_CHECK_LIB(c_r, pthread_create, [AC_DEFINE(WITH_THREAD)
     posix_threads=yes
     LIBS="$LIBS -lc_r"
-    THREADOBJ="Python/thread.o"], [
+    THREADOBJ="Python.dir/thread.o"], [
     AC_CHECK_LIB(pthread, __pthread_create_system, [AC_DEFINE(WITH_THREAD)
     posix_threads=yes
     LIBS="$LIBS -lpthread"
-    THREADOBJ="Python/thread.o"], [
+    THREADOBJ="Python.dir/thread.o"], [
     AC_CHECK_LIB(cma, pthread_create, [AC_DEFINE(WITH_THREAD)
     posix_threads=yes
     LIBS="$LIBS -lcma"
-    THREADOBJ="Python/thread.o"],[
+    THREADOBJ="Python.dir/thread.o"],[
     USE_THREAD_MODULE="#"])
     ])])])])])])])])])])
 
     AC_CHECK_LIB(mpc, usconfig, [AC_DEFINE(WITH_THREAD)
     LIBS="$LIBS -lmpc"
-    THREADOBJ="Python/thread.o"
+    THREADOBJ="Python.dir/thread.o"
     USE_THREAD_MODULE=""])
 
     if test "$posix_threads" != "yes"; then     
       AC_CHECK_LIB(thread, thr_create, [AC_DEFINE(WITH_THREAD)
       LIBS="$LIBS -lthread"
-      THREADOBJ="Python/thread.o"
+      THREADOBJ="Python.dir/thread.o"
       USE_THREAD_MODULE=""])
     fi
 
@@ -3886,7 +3886,7 @@
 
 AC_SUBST(THREADHEADERS)
 
-for h in `(cd $srcdir;echo Python/thread_*.h)`
+for h in `(cd $srcdir;echo Python.dir/thread_*.h)`
 do
   THREADHEADERS="$THREADHEADERS \$(srcdir)/$h"
 done
--- configure.in.orig	2009-12-19 16:53:07 -0800
+++ configure.in	2009-12-19 16:53:20 -0800
@@ -3892,7 +3892,7 @@
 done
 
 AC_SUBST(SRCDIRS)
-SRCDIRS="Parser Grammar Objects Python Modules Mac"
+SRCDIRS="Parser Grammar Objects Python.dir Modules Mac"
 AC_MSG_CHECKING(for build directories)
 for dir in $SRCDIRS; do
     if test ! -d $dir; then