--- a/Makefile.in	Mon Aug 13 09:47:55 2007 +0200
+++ b/Makefile.in	Mon Aug 13 09:49:09 2007 +0200
@@ -49,8 +49,11 @@
 ## make extraclean
 ##      Still more severe - delete backup and autosave files, too.
 
+@SET_MAKE@
+RECURSIVE_MAKE=@RECURSIVE_MAKE@
 SHELL = /bin/sh
-@SET_MAKE@
+RM = rm -f
+pwd = /bin/pwd
 
 ## ==================== Things `configure' Might Edit ====================
 
@@ -58,9 +61,6 @@
 CPP=@CPP@
 LN_S=@LN_S@
 CFLAGS=@CFLAGS@
-YACC=@YACC@
-pwd=/bin/pwd
-RM=rm -f
 
 ## These help us choose version- and architecture-specific directories
 ## to install files in.
@@ -229,24 +229,23 @@
 .PHONY: ${SUBDIR} all beta all-elc all-elcs dump-elc dump-elcs autoloads
 
 ## Convenience target for XEmacs beta testers
-beta:	clean all-elc
+beta: clean all-elc
 
 ## Convenience target for XEmacs maintainers
 ## This would run `make-xemacsdist' if I were really confident that everything
 ## was turnkey.
-dist:	all-elc info
+dist: all-elc info
 
 ## Build XEmacs and recompile out-of-date and missing .elc files along
 ## the way.
-all-elc all-elcs:   lib-src lwlib dump-elcs src
+all-elc all-elcs: lib-src lwlib dump-elcs src
 	MAKE='$(MAKE)' sh ${srcdir}/lib-src/update-elc.sh
 
 ## Sub-target for all-elc.
 dump-elc dump-elcs: ${GENERATED_HEADERS} FRC.dump-elcs
-	cd src && $(MAKE) dump-elcs $(MFLAGS) \
-		CC='${CC}' CFLAGS='${CFLAGS}' MAKE='${MAKE}'
+	cd src && $(RECURSIVE_MAKE) dump-elcs
 
-autoloads:	src
+autoloads: src
 	MAKE='$(MAKE)' sh ${srcdir}/lib-src/update-autoloads.sh
 
 ## We force the rebuilding of src/paths.h because the user might give
@@ -301,7 +300,7 @@
 	 echo "  	Automatically generated by XEmacs */" ; \
 	 echo "#define PURESIZE_ADJUSTMENT 0") > $@
 
-src:	@SRC_SUBDIR_DEPS@ FRC.src
+src: @SRC_SUBDIR_DEPS@ FRC.src
 pkg-src/tree-x: pkg-src/FRC.tree-x
 lib-src: FRC.lib-src
 lwlib:	FRC.lwlib
@@ -311,8 +310,7 @@
 .RECURSIVE: ${SUBDIR}
 
 ${SUBDIR}: ${SUBDIR_MAKEFILES} ${GENERATED_HEADERS} FRC
-	cd $@ && $(MAKE) all $(MFLAGS) \
-		CC='${CC}' CFLAGS='${CFLAGS}' MAKE='${MAKE}'
+	cd $@ && $(RECURSIVE_MAKE) all
 
 Makefile: ${srcdir}/Makefile.in config.status
 	./config.status
@@ -366,7 +364,7 @@
 
 install-arch-dep: mkdir
 	for subdir in ${INSTALL_ARCH_DEP_SUBDIR}; do \
-	( cd $${subdir} && $(MAKE) install $(MFLAGS) prefix=${prefix} \
+	( cd $${subdir} && $(RECURSIVE_MAKE) install prefix=${prefix} \
 	    exec_prefix=${exec_prefix} bindir=${bindir} libdir=${libdir} \
 	    archlibdir=${archlibdir} ) ; done
 	if test `(cd ${archlibdir} && $(pwd))` != `(cd lib-src && $(pwd))`; then \
@@ -443,7 +441,7 @@
 #### would be extremely dangerous for anyone to use it.
 #uninstall:
 #	(cd lib-src; 					\
-#	 $(MAKE) $(MFLAGS) uninstall			\
+#	 $(RECURSIVE_MAKE) uninstall			\
 #	    prefix=${prefix} exec_prefix=${exec_prefix}	\
 #	    bindir=${bindir} libdir=${libdir} archlibdir=${archlibdir})
 #	for dir in ${lispdir} ${etcdir} ; do 		\
@@ -477,7 +475,7 @@
 ##      target for GCC does not delete `libgcc.a', because recompiling it
 ##      is rarely necessary and takes a lot of time.
 mostlyclean: FRC.mostlyclean
-	for d in $(SUBDIR); do (cd $$d && $(MAKE) $(MFLAGS) $@); done
+	for d in $(SUBDIR); do (cd $$d && $(RECURSIVE_MAKE) $@); done
 
 ## `clean'
 ##      Delete all files from the current directory that are normally
@@ -488,7 +486,7 @@
 
 ##      Delete `.dvi' files here if they are not part of the distribution.
 clean: FRC.clean
-	for d in $(SUBDIR); do (cd $$d && $(MAKE) $(MFLAGS) $@); done
+	for d in $(SUBDIR); do (cd $$d && $(RECURSIVE_MAKE) $@); done
 	$(RM) core
 
 ## `distclean'
@@ -506,7 +504,7 @@
 
 distclean: FRC.distclean
 	for d in lock site-lisp; do test -d $$d || mkdir $$d; done
-	for d in $(SUBDIR); do (cd $$d && $(MAKE) $(MFLAGS) $@); done
+	for d in $(SUBDIR); do (cd $$d && $(RECURSIVE_MAKE) $@); done
 	-${top_distclean}
 
 ## `realclean'
@@ -521,7 +519,7 @@
 ##      anything that needs to exist in order to run `configure' and then
 ##      begin to build the program.
 realclean: FRC.realclean
-	for d in $(SUBDIR); do (cd $$d && $(MAKE) $(MFLAGS) $@); done
+	for d in $(SUBDIR); do (cd $$d && $(RECURSIVE_MAKE) $@); done
 	-${top_distclean}
 	$(RM) TAGS
 
@@ -530,7 +528,7 @@
 ## the coding standards seem to come from.  It's like distclean, but
 ## it deletes backup and autosave files too.
 extraclean:
-	for d in $(SUBDIR); do (cd $$d && $(MAKE) $(MFLAGS) $@); done
+	for d in $(SUBDIR); do (cd $$d && $(RECURSIVE_MAKE) $@); done
 	$(RM) *~ \#*
 	-${top_distclean}
 
@@ -552,24 +550,18 @@
 unlock:
 	chmod u+w $(SOURCES) cpp/*
 	-cd elisp && chmod u+w Makefile README *.texi
-	cd etc     && $(MAKE) $(MFLAGS) unlock
-	cd lib-src && $(MAKE) $(MFLAGS) unlock
-	cd lisp    && $(MAKE) $(MFLAGS) unlock
+	for d in src etc lib-src lisp; do (cd $$d && $(RECURSIVE_MAKE) $@); done
 	cd lisp/term && chmod u+w README *.el
 	cd man && chmod u+w *texi* ChangeLog split-man
 	cd lwlib && chmod u+w *.[ch] Makefile.in.in
-	cd src && $(MAKE) $(MFLAGS) $@
 
 relock:
 	chmod u-w $(SOURCES) cpp/*
 	-cd elisp && chmod u-w Makefile README *.texi
-	cd etc     && $(MAKE) $(MFLAGS) relock
-	cd lib-src && $(MAKE) $(MFLAGS) relock
-	cd lisp    && $(MAKE) $(MFLAGS) relock
+	for d in src etc lib-src lisp; do (cd $$d && $(RECURSIVE_MAKE) $@); done
 	cd lisp/term && chmod u+w README *.el
 	cd man && chmod u+w *texi* ChangeLog split-man
 	cd lwlib && chmod u+w *.[ch] Makefile.in.in
-	cd src && $(MAKE) $(MFLAGS) $@
 
 TAGS tags: FRC.tags
 	@echo "If you don't have a copy of etags around, then do 'make lib-src' first."
@@ -590,10 +582,10 @@
 ##	cd ${srcdir} && make-dist
 
 info: FRC.info
-	cd ${srcdir}/man && $(MAKE) $(MFLAGS) $@
+	cd ${srcdir}/man && $(RECURSIVE_MAKE) $@
 
 dvi:
-	cd ${srcdir}/man && $(MAKE) $(MFLAGS) $@
+	cd ${srcdir}/man && $(RECURSIVE_MAKE) $@
 
 ## Fix up version information in executables (Solaris-only)
 mcs: