--- a/lib-src/update-autoloads.sh	Mon Aug 13 09:45:48 2007 +0200
+++ b/lib-src/update-autoloads.sh	Mon Aug 13 09:46:53 2007 +0200
@@ -46,7 +46,18 @@
 fi
 
 # Compute patterns to ignore when searching for files
-ignore_dirs=""
+# These directories don't have autoloads and customizations, or are partially
+#  broken.
+ignore_dirs="cl egg eos ilisp its language locale mel mu sunpro term tooltalk"
+
+# Prepare for autoloading directories with directory-specific instructions
+make_special_commands=''
+make_special () {
+	dir="$1"; shift;
+	ignore_dirs="$ignore_dirs $dir"
+	make_special_commands="$make_special_commands \
+		(cd \"lisp/$dir\" && ${MAKE:-make} EMACS=$REAL ${1+$*});"
+}
 
 # Only use Mule XEmacs to build Mule-specific autoloads & custom-loads.
 echon "Checking for Mule support..."
@@ -54,17 +65,30 @@
 mule_p="`$EMACS -batch -no-site-file -eval \"$lisp_prog\"`"
 if test "$mule_p" = nil ; then
 	echo No
-	ignore_dirs="$ignore_dirs its egg mule leim"
+	ignore_dirs="$ignore_dirs mule leim"
 else
 	echo Yes
 fi
 
+if test "$mule_p" = nil ; then
+	make_special auctex autoloads
+else
+	make_special auctex autoloads MULE_EL=tex-jp.elc
+fi
+make_special cc-mode autoloads
+make_special efs autoloads
+#make_special eos autoloads # EOS doesn't have custom or autoloads
+#make_special gnus autoloads
+make_special hyperbole autoloads
+# make_special ilisp autoloads
+make_special oobr HYPB_ELC='' autoloads
+make_special w3 autoloads
+
 dirs=
 for dir in lisp/*; do
 	if test -d $dir \
 		-a $dir != lisp/CVS \
-		-a $dir != lisp/SCCS \
-		-a $dir != lisp/language; then
+		-a $dir != lisp/SCCS; then
 		for ignore in $ignore_dirs; do
 			if test $dir = lisp/$ignore; then
 				continue 2
@@ -74,7 +98,9 @@
 	fi
 done
 
-set -x
+# set -x
 for dir in $dirs; do
 	$EMACS -batch -q -l autoload -f batch-update-directory $dir
 done
+
+eval "$make_special_commands"