Index: configure
===================================================================
--- configure	(revision 66055)
+++ configure	(working copy)
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 60465 .
+# From configure.in Revision: 60766 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for python 2.5.
 #
@@ -736,6 +736,7 @@
       ac_precious_vars='build_alias
 host_alias
 target_alias
+MACHDEP
 CC
 CFLAGS
 LDFLAGS
@@ -1351,6 +1352,7 @@
   --with-libc=STRING      C library
 
 Some influential environment variables:
+  MACHDEP     name for machine-dependent library files
   CC          C compiler command
   CFLAGS      C compiler flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
Index: configure.in
===================================================================
--- configure.in	(revision 66055)
+++ configure.in	(working copy)
@@ -161,7 +161,7 @@
 ##                           Use (OpenStep|Rhapsody) dynamic linker))
 ##
 # Set name for machine-dependent library files
-AC_SUBST(MACHDEP)
+AC_ARG_VAR([MACHDEP], [name for machine-dependent library files])
 AC_MSG_CHECKING(MACHDEP)
 if test -z "$MACHDEP"
 then
Index: Makefile.pre.in
===================================================================
--- Makefile.pre.in	(revision 66055)
+++ Makefile.pre.in	(working copy)
@@ -975,12 +975,11 @@
 
 # Build the toplevel Makefile
 Makefile.pre: Makefile.pre.in config.status
-	CONFIG_FILES=Makefile.pre CONFIG_HEADERS= $(SHELL) config.status
-	$(MAKE) -f Makefile.pre Makefile
+	$(SHELL) ./config.status $@
 
 # Run the configure script.
 config.status:	$(srcdir)/configure
-	$(SHELL) $(srcdir)/configure $(CONFIG_ARGS)
+	$(SHELL) ./config.status --recheck
 
 .PRECIOUS: config.status $(BUILDPYTHON) Makefile Makefile.pre
 
@@ -995,8 +994,8 @@
 # Rerun configure with the same options as it was run last time,
 # provided the config.status script exists
 recheck:
-	$(SHELL) config.status --recheck
-	$(SHELL) config.status
+	$(SHELL) ./config.status --recheck
+	$(SHELL) ./config.status
 
 # Rebuild the configure script from configure.in; also rebuild pyconfig.h.in
 autoconf: