--- a/lib-src/update-autoloads.sh	Mon Aug 13 08:47:56 2007 +0200
+++ b/lib-src/update-autoloads.sh	Mon Aug 13 08:48:16 2007 +0200
@@ -1,5 +1,5 @@
 #!/bin/sh
-### update-autoloads.sh --- update loaddefs.el as necessary
+### update-autoloads.sh --- update auto-loaddefs.el as necessary
 
 set -eu
 
@@ -28,7 +28,25 @@
 echo "Recompiling in `pwd|sed 's|^/tmp_mnt||'`"
 echo "          with $REAL..."
 
-$EMACS -batch -q -f batch-update-autoloads \
-  `ls lisp | egrep -v \
-  "COPYING|README|SCCS|egg|eterm|its|mule|paths.el|quail|version.el|vms" \
-  | xargs -i echo lisp/\{\}`
+dirs=
+for dir in lisp/* ; do
+  if test -d $dir \
+   -a $dir != lisp/CVS \
+   -a $dir != lisp/SCCS \
+   -a $dir != lisp/egg \
+   -a $dir != lisp/eterm \
+   -a $dir != lisp/its \
+   -a $dir != lisp/mule \
+   -a $dir != lisp/quail \
+   -a $dir != lisp/vms ; then
+    dirs="$dirs $dir"
+  fi
+done
+cat > lisp/prim/auto-autoloads.el << EOF
+;;; Do NOT edit this file!
+;;; It is automatically generated using "make autoloads"
+;;; See update-autoloads.sh and autoload.el for more details.
+
+EOF
+set -x
+$EMACS -batch -q -l autoload -f batch-update-autoloads $dirs