--- a/Makefile.in.in	Tue Dec 07 00:20:51 2004 +0000
+++ b/Makefile.in.in	Tue Dec 07 12:52:51 2004 +0000
@@ -55,10 +55,10 @@
 #include "src/config.h"
 
 #ifdef USE_GNU_MAKE
-RECURSIVE_MAKE=$(MAKE)
+RECURSIVE_MAKE_ARGS=
 #else
 @SET_MAKE@
-RECURSIVE_MAKE=@RECURSIVE_MAKE@
+RECURSIVE_MAKE_ARGS=@RECURSIVE_MAKE_ARGS@
 #endif
 
 SHELL = /bin/sh
@@ -275,13 +275,13 @@
 	cd ${srcdir} && $(SHELL) lib-src/config.values.sh
 
 depend ${srcdir}/src/depend:
-	+cd ./src && $(RECURSIVE_MAKE) depend
+	cd ./src && $(MAKE) $(RECURSIVE_MAKE_ARGS) depend
 
 check:
-	+cd ./src && $(RECURSIVE_MAKE) $@
+	cd ./src && $(MAKE) $(RECURSIVE_MAKE_ARGS) $@
 
 check-features: all
-	+cd ./src && $(RECURSIVE_MAKE) $@
+	cd ./src && $(MAKE) $(RECURSIVE_MAKE_ARGS) $@
 
 ## We have to force the building of Emacs.ad.h as well in order to get it
 ## updated correctly when VPATH is being used.  Since we use move-if-change,
@@ -310,14 +310,14 @@
 FRC.lisp.finder-inf.el:
 
 ${SUBDIR}: ${SUBDIR_MAKEFILES} ${GENERATED_HEADERS} FRC
-	+cd ./$@ && $(RECURSIVE_MAKE) all
+	cd ./$@ && $(MAKE) $(RECURSIVE_MAKE_ARGS) all
 
 ## Building modules depends on ellcc, found in lib-src.
 modules/sample modules/ldap modules/zlib modules/base64 modules/postgresql: lib-src
 
 Makefile: ${srcdir}/Makefile.in.in config.status
 	./config.status
-	$(RECURSIVE_MAKE) all
+	$(MAKE) $(RECURSIVE_MAKE_ARGS) all
 
 src/Makefile: ${srcdir}/src/Makefile.in.in ${srcdir}/src/depend config.status
 	./config.status
@@ -375,7 +375,7 @@
 
 install-arch-dep: mkdir
 	for subdir in ${INSTALL_ARCH_DEP_SUBDIR}; do \
-	(cd ./$${subdir} && $(RECURSIVE_MAKE) install prefix=${prefix} \
+	(cd ./$${subdir} && $(MAKE) $(RECURSIVE_MAKE_ARGS) install prefix=${prefix} \
 	    exec_prefix=${exec_prefix} bindir=${bindir} libdir=${libdir} \
 	    archlibdir=${archlibdir}) ; done
 	if test "`(cd ${archlibdir} && $(pwd))`" != \
@@ -492,7 +492,7 @@
 #### would be extremely dangerous for anyone to use it.
 ##uninstall:
 ##	(cd ./lib-src; 					\
-##	 $(RECURSIVE_MAKE) uninstall			\
+##	 $(MAKE) $(RECURSIVE_MAKE_ARGS) uninstall			\
 ##	    prefix=${prefix} exec_prefix=${exec_prefix}	\
 ##	    bindir=${bindir} libdir=${libdir} archlibdir=${archlibdir})
 ##	for dir in ${lispdir} ${etcdir} ; do 		\
@@ -526,7 +526,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 && $(RECURSIVE_MAKE) $@); done
+	for d in $(SUBDIR); do (cd ./$$d && $(MAKE) $(RECURSIVE_MAKE_ARGS) $@); done
 	$(RM) core
 
 ## `clean'
@@ -542,7 +542,7 @@
 ##      when they don't work right.  (beta can't depend on distclean, which
 ##      removes necessary files generated by configure.)
 clean: FRC.clean
-	+for d in $(SUBDIR); do (cd ./$$d && $(RECURSIVE_MAKE) $@); done
+	for d in $(SUBDIR); do (cd ./$$d && $(MAKE) $(RECURSIVE_MAKE_ARGS) $@); done
 	$(RM) core lisp/auto-autoloads.el* lisp/custom-load.el*
 	$(RM) lisp/mule/auto-autoloads.el* lisp/mule/custom-load.el*
 	$(RM) modules/auto-autoloads.el* modules/custom-load.el*
@@ -560,7 +560,7 @@
 	$(RM) -r site-packages xemacs-packages mule-packages site-lisp
 
 distclean: FRC.distclean
-	+for d in $(SUBDIR); do (cd ./$$d && $(RECURSIVE_MAKE) $@); done
+	for d in $(SUBDIR); do (cd ./$$d && $(MAKE) $(RECURSIVE_MAKE_ARGS) $@); done
 	-${top_distclean}
 
 ## `realclean'
@@ -575,7 +575,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 && $(RECURSIVE_MAKE) $@); done
+	for d in $(SUBDIR); do (cd ./$$d && $(MAKE) $(RECURSIVE_MAKE_ARGS) $@); done
 	-${top_distclean}
 	$(RM) TAGS
 
@@ -584,7 +584,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 && $(RECURSIVE_MAKE) $@); done
+	for d in $(SUBDIR); do (cd ./$$d && $(MAKE) $(RECURSIVE_MAKE_ARGS) $@); done
 	$(RM) *~ \#*
 	-${top_distclean}
 
@@ -606,7 +606,7 @@
 unlock:
 	chmod u+w $(SOURCES) cpp/*
 	-cd ./elisp && chmod u+w Makefile README *.texi
-	for d in src etc lib-src lisp; do (cd ./$$d && $(RECURSIVE_MAKE) $@); done
+	for d in src etc lib-src lisp; do (cd ./$$d && $(MAKE) $(RECURSIVE_MAKE_ARGS) $@); 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
@@ -614,7 +614,7 @@
 relock:
 	chmod u-w $(SOURCES) cpp/*
 	-cd ./elisp && chmod u-w Makefile README *.texi
-	for d in src etc lib-src lisp; do (cd ./$$d && $(RECURSIVE_MAKE) $@); done
+	for d in src etc lib-src lisp; do (cd ./$$d && $(MAKE) $(RECURSIVE_MAKE_ARGS) $@); 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
@@ -635,10 +635,10 @@
 	  xargs etags -a -l none -r "/^(def\\(var\\|un\\|alias\\|const\\|macro\\|subst\\|struct\\|face\\|group\\|custom\\|ine-\\(function\\|compiler-macro\\|[a-z-]+alias\\)\\)[ 	]+'?\\([^ 	]+\\)/\\3/"
 
 info: FRC.info
-	+cd ${srcdir}/man && $(RECURSIVE_MAKE) $@
+	cd ${srcdir}/man && $(MAKE) $(RECURSIVE_MAKE_ARGS) $@
 
 dvi:
-	+cd ${srcdir}/man && $(RECURSIVE_MAKE) $@
+	cd ${srcdir}/man && $(MAKE) $(RECURSIVE_MAKE_ARGS) $@
 
 ## Fix up version information in executables (Solaris-only)
 mcs: