Reverse the order in which Setup and Setup.local are passed to the
makesetup script.  (Sorry Sjoerd -- I know you proposed this a while
ago and I didn't think it would work then.  I looked again and it
does work.)
diff --git a/Modules/Makefile.pre.in b/Modules/Makefile.pre.in
index a5b2f97..e62d5ed 100644
--- a/Modules/Makefile.pre.in
+++ b/Modules/Makefile.pre.in
@@ -152,7 +152,7 @@
 # longer pertinent (but that were in a previous configuration).
 config.c Makefile: Makefile.pre config.c.in $(MAKESETUP) Setup Setup.local
 		-rm -f $(LIBRARY)
-		$(SHELL) $(MAKESETUP) Setup Setup.local
+		$(SHELL) $(MAKESETUP) Setup.local Setup
 
 Setup:
 		cp $(srcdir)/Setup.in Setup