--- a/Makefile.in.in	Mon Aug 13 11:33:40 2007 +0200
+++ b/Makefile.in.in	Mon Aug 13 11:35:02 2007 +0200
@@ -283,23 +283,42 @@
 ${srcdir}/lib-src/config.values.in : ${srcdir}/configure
 	cd ${srcdir} && $(SHELL) lib-src/config.values.sh
 
-depend ${srcdir}/src/depend :
-	cd ${srcdir}/src && $(RECURSIVE_MAKE) depend
+depend ${srcdir}/src/depend:
+	cd ./src && $(RECURSIVE_MAKE) depend
 
 ## Build XEmacs and recompile out-of-date and missing .elc files along
 ## the way.
 all-elc all-elcs: lib-src lwlib dump-elcs src
-	MAKE='$(MAKE)' EMACS='./src/$(PROGNAME)' $(SHELL) ${srcdir}/lib-src/update-elc.sh
+	${blddir}/src/${PROGNAME} -batch -vanilla \
+		-l update-elc-2.el -f batch-update-elc-2 lisp
 
 ## Sub-target for all-elc.
 dump-elc dump-elcs: ${GENERATED_HEADERS} FRC.dump-elcs
 	cd ./src && $(RECURSIVE_MAKE) dump-elcs
 
-autoloads: src
-	MAKE='$(MAKE)' EMACS='./src/$(PROGNAME)' $(SHELL) ${srcdir}/lib-src/update-autoloads.sh
+autoloads: lisp/auto-autoloads.el lisp/custom-load.el
 
-custom-loads:
-	MAKE='$(MAKE)' EMACS='./src/$(PROGNAME)' $(SHELL) ${srcdir}/lib-src/update-custom.sh
+FRC.lisp.auto.autoloads.el:
+lisp/auto-autoloads.el:	FRC.lisp.auto.autoloads.el
+	$(RM) lisp/auto-autoloads.el
+	${blddir}/src/${PROGNAME} -batch -vanilla \
+		-l autoload -f batch-update-directory lisp
+	${blddir}/src/${PROGNAME} -batch -vanilla \
+		-f batch-byte-compile lisp/auto-autoloads.el
+	@$(RM) lisp/auto-autoloads.el~
+#ifdef MULE
+	$(RM) lisp/mule/auto-autoloads.el
+	${blddir}/src/${PROGNAME} -batch -vanilla \
+		-l autoload -f batch-update-directory lisp/mule
+	${blddir}/src/${PROGNAME} -batch -vanilla \
+		-f batch-byte-compile lisp/mule/auto-autoloads.el
+	@$(RM) lisp/mule/auto-autoloads.el~
+#endif
+
+FRC.lisp.custom.load.el:
+lisp/custom-load.el: FRC.lisp.custom.load.el
+	${blddir}/src/${PROGNAME} -batch -vanilla -l cus-dep \
+		-f Custom-make-dependencies lisp
 
 finder: src
 	@echo "Building finder database ..."
@@ -418,18 +437,21 @@
 	   for subdir in `find ${archlibdir} -type d ! -name RCS ! -name SCCS ! -name CVS -print` ; \
 	     do (cd $${subdir} && $(RM) -r RCS CVS SCCS \#* *~) ; done ; \
 	else true; fi
-#ifdef WINDOWSNT
+#ifdef PDUMP
+	${INSTALL_DATA} src/${PROGNAME}.dmp ${bindir}/${PROGNAME}-${version}-`src/${PROGNAME} -sd`.dmp
+#endif
+#ifdef WIN32_NATIVE
 	${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}
 	-chmod 0755 ${bindir}/${PROGNAME}
 #else
 	${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}-${version}
 	-chmod 0755 ${bindir}/${PROGNAME}-${version}
-# ifdef __CYGWIN32__
+# ifdef CYGWIN
 	cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version}.exe ./${PROGNAME}
 # else
 	cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${PROGNAME}
-# endif /* __CYGWIN32__ */
-#endif /* WINDOWSNT */
+# endif /* CYGWIN */
+#endif /* WIN32_NATIVE */
 	if test "${prefix}" != "${exec_prefix}"; then \
 	  $(MAKEPATH) ${exec_prefix}/lib/${instvardir}; \
 	  for dir in \