--- a/Makefile.in.in	Mon Aug 13 11:19:22 2007 +0200
+++ b/Makefile.in.in	Mon Aug 13 11:20:41 2007 +0200
@@ -49,9 +49,6 @@
 ## make extraclean
 ##      Still more severe - delete backup and autosave files, too.
 
-#define NOT_C_CODE
-#include "src/config.h"
-
 #ifdef USE_GNU_MAKE
 RECURSIVE_MAKE=$(MAKE)
 #else
@@ -63,9 +60,7 @@
 LANG = C
 LC_ALL = C
 RM = rm -f
-MAKEPATH=./lib-src/make-path
 pwd = /bin/pwd
-TAR = tar
 
 ## ==================== Things `configure' Might Edit ====================
 
@@ -98,14 +93,6 @@
 ## not need to change them.  This defaults to /usr/local.
 prefix=@prefix@
 
-## Variable data (as per each program update) goes here
-## The default is ${PROGNAME}
-inststaticdir=@inststaticdir@
-
-## Static data (constant across program updates) goes here
-## The default is ${PROGNAME}-${version}
-instvardir=@instvardir@
-
 ## Like `prefix', but used for architecture-specific files.
 exec_prefix=@exec_prefix@
 
@@ -204,9 +191,6 @@
 ## currently being edited.
 lockdir=@lockdir@
 
-## Where to put the DOC file.
-docdir=@docdir@
-
 ## Where to put executables to be run by XEmacs rather than
 ## the user.  This path usually includes the XEmacs version
 ## and configuration name, so that multiple configurations
@@ -229,10 +213,7 @@
 MAKE_SUBDIR = @MAKE_SUBDIR@
 
 ## Subdirectories that can be made recursively.
-SUBDIR = ${MAKE_SUBDIR} man  
-
-## Subdirectories that must be cleaned on distclean
-SUBDIR_DISTCLEAN = ${SUBDIR} modules/sample modules/ldap modules/zlib modules/base64
+SUBDIR = ${MAKE_SUBDIR} man
 
 ## The makefiles of the directories in ${MAKE_SUBDIR}.
 SUBDIR_MAKEFILES = @SUBDIR_MAKEFILES@
@@ -261,7 +242,7 @@
 .PHONY: ${SUBDIR} all beta all-elc all-elcs dump-elc dump-elcs autoloads finder
 
 ## Convenience target for XEmacs beta testers
-beta: clean all-elc finder info
+beta: clean all-elc finder
 
 ## Convenience target for XEmacs maintainers
 ## This would run `make-xemacsdist' if I were really confident that everything
@@ -275,49 +256,30 @@
 ## - src/depend from src/*.[ch]
 .PHONY: config configure depend
 config: configure depend
-configure: ${srcdir}/configure ${srcdir}/lib-src/config.values.in
-
-${srcdir}/configure : ${srcdir}/configure.in
+configure: ${srcdir}/configure
+${srcdir}/configure: ${srcdir}/configure.in
 	cd ${srcdir} && autoconf
+	cd ${srcdir} && /bin/sh lib-src/config.values.sh
 
-${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 ${srcdir}/src && \
+		perl ./make-src-depend > depend.tmp && \
+		$(RM) depend && mv depend.tmp 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
+	MAKE='$(MAKE)' EMACS='./src/$(PROGNAME)' sh ${srcdir}/lib-src/update-elc.sh
 
 ## Sub-target for all-elc.
 dump-elc dump-elcs: ${GENERATED_HEADERS} FRC.dump-elcs
 	cd ./src && $(RECURSIVE_MAKE) dump-elcs
 
-autoloads: lisp/auto-autoloads.el lisp/custom-load.el
+autoloads: src
+	MAKE='$(MAKE)' EMACS='./src/$(PROGNAME)' sh ${srcdir}/lib-src/update-autoloads.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
+custom-loads:
+	MAKE='$(MAKE)' EMACS='./src/$(PROGNAME)' sh ${srcdir}/lib-src/update-custom.sh
 
 finder: src
 	@echo "Building finder database ..."
@@ -344,7 +306,7 @@
 	@(echo "/*	Do not edit this file!" ; \
 	  echo "  	Automatically generated from ${srcdir}/etc/Emacs.ad" ; \
 	  echo " */" ; \
-	  $(SHELL) ${srcdir}/lib-src/ad2c ${srcdir}/etc/Emacs.ad ) > \
+	  /bin/sh ${srcdir}/lib-src/ad2c ${srcdir}/etc/Emacs.ad ) > \
 	  src/Emacs.ad.h
 
 src/sheap-adjust.h:
@@ -431,33 +393,21 @@
 	   if test -f ../Installation; then \
 		${INSTALL_DATA} ../Installation ${archlibdir}/Installation; \
 	   fi; \
-	   ${INSTALL_DATA} lib-src/config.values ${docdir}/config.values; \
-	   ${INSTALL_DATA} lib-src/DOC ${docdir}/DOC; \
+	   for f in DOC config.values; do \
+		${INSTALL_DATA} lib-src/$${f} ${archlibdir}/$${f}; \
+	   done ; \
 	   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 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 CYGWIN
-	cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version}.exe ./${PROGNAME}
-# else
 	cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${PROGNAME}
-# endif /* CYGWIN */
-#endif /* WIN32_NATIVE */
 	if test "${prefix}" != "${exec_prefix}"; then \
-	  $(MAKEPATH) ${exec_prefix}/lib/${instvardir}; \
 	  for dir in \
-		lib/${inststaticdir} \
-	 	lib/${instvardir}/etc \
-		lib/${instvardir}/info \
-		lib/${instvardir}/lisp; do \
+		lib/${PROGNAME} \
+	 	lib/${PROGNAME}-${version}/etc \
+		lib/${PROGNAME}-${version}/info \
+		lib/${PROGNAME}-${version}/lisp; do \
 	    if test ! -d ${exec_prefix}/$${dir}; then \
 	      $(LN_S) ${prefix}/$${dir} ${exec_prefix}/$${dir}; fi; \
 	  done; \
@@ -482,8 +432,8 @@
 	     -a "`(cd $${dir} && $(pwd))`" != \
 		"`(cd $${dest} && $(pwd))`" \
 	   && (echo "Copying $${dir}..." ; \
-	       (cd $${dir} && $(TAR) -cf - . ) | \
-		(cd $${dest} && umask 022 && $(TAR) -xf - );\
+	       (cd $${dir} && tar -cf - . ) | \
+		(cd $${dest} && umask 022 && tar -xf - );\
 	       chmod 0755 $${dest}; \
 	       for subdir in `find $${dest} -type d ! -name RCS ! -name SCCS ! -name CVS -print` ; do \
 		 (cd $${subdir} && $(RM) -r RCS CVS SCCS \#* *~) ; \
@@ -499,6 +449,7 @@
 	    chmod 0644 ${infodir}/$${file}; \
 	  done ; \
 	fi
+	## Note it's `xemacs' not ${PROGNAME}
 	cd ${srcdir}/etc && \
 	  for page in xemacs etags ctags gnuserv gnuclient gnuattach gnudoit; do \
 	    ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext} ; \
@@ -512,14 +463,15 @@
 	@echo "${lispdir}"
 
 gzip-el:
-	$(SHELL) ${srcdir}/lib-src/gzip-el.sh ${lispdir}
+	${srcdir}/lib-src/gzip-el.sh ${lispdir}
 
+MAKEPATH=./lib-src/make-path
 ## Build all the directories to install XEmacs in.
 ## Since we may be creating several layers of directories,
 ## (e.g. /usr/local/lib/${PROGNAME}-20.5/sparc-sun-solaris2.6), we use
 ## make-path instead of mkdir.  Not all mkdirs have the `-p' flag.
 mkdir: FRC.mkdir
-	${MAKEPATH} ${COPYDESTS} ${lockdir} ${docdir} ${infodir} ${archlibdir} \
+	${MAKEPATH} ${COPYDESTS} ${lockdir} ${infodir} ${archlibdir} \
 	  ${mandir} ${bindir} ${datadir} ${libdir} ${pkgdir} \
 	  ${sitelispdir} ${moduledir} ${sitemoduledir}
 	-chmod 0777 ${lockdir}
@@ -591,10 +543,10 @@
 	$(RM) config.status config.log confdefs.h config-tmp-* build-install Installation ; \
 	$(RM) core .sbinit lock/* GNUmakefile Makefile Makefile.in ; \
 	$(RM) lisp/finder-inf.el* Installation.el Installation.elc ; \
-	$(RM) -r site-packages xemacs-packages mule-packages site-lisp
+	$(RM) packages mule-packages site-lisp
 
 distclean: FRC.distclean
-	for d in $(SUBDIR_DISTCLEAN); do (cd ./$$d && $(RECURSIVE_MAKE) $@); done
+	for d in $(SUBDIR); do (cd ./$$d && $(RECURSIVE_MAKE) $@); done
 	-${top_distclean}
 
 ## `realclean'