merge trunk

3 files changed, 26 insertions, 12 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index d96368c4f9a..a20e93d38c2 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,15 @@
+2014-06-30  Glenn Morris  <rgm@gnu.org>
+
+        * update_autogen: Find loaddefs targets rather than
+        parsing lisp/Makefile.in
+
+2014-06-29  Glenn Morris  <rgm@gnu.org>
+
+        * update_autogen: Remove need to cd into/out of lisp/.
+
+        * grammars/Makefile.in (bootstrap-clean): Don't delete Makefile,
+        for sake of top-level maintainer-clean rule.
+
 2014-06-26  Eli Zaretskii  <eliz@gnu.org>
 
         * notes/unicode: Some notes about what to do when a new Unicode
diff --git a/admin/grammars/Makefile.in b/admin/grammars/Makefile.in
index 1454225b80a..c3ee2ef951f 100644
--- a/admin/grammars/Makefile.in
+++ b/admin/grammars/Makefile.in
@@ -99,7 +99,10 @@ ${cedetdir}/srecode/srt-wy.el: ${srcdir}/srecode-template.wy
 distclean:
         rm -f Makefile
 
-bootstrap-clean maintainer-clean: distclean
+## Perhaps this should do what extraclean (qv) does.
+bootstrap-clean:
+
+maintainer-clean: distclean
 
 ## We do not normally delete the generated files, even in bootstrap.
 ## Creating them does not take long, so we could easily change this.
diff --git a/admin/update_autogen b/admin/update_autogen
index d9d34fa3d6e..ef0edfef50c 100755
--- a/admin/update_autogen
+++ b/admin/update_autogen
@@ -322,15 +322,20 @@ EOF
 
 echo "Finding loaddef targets..."
 
-sed -n -e '/^AUTOGEN_VCS/,/^$/p' lisp/Makefile.in | \
-    sed -e '/AUTOGEN_VCS/d' -e '/^$/d' -e 's/\\//' \
-    >| $tempfile || die "sed error"
+find lisp -name '*.el' -exec grep '^;.*generated-autoload-file:' {} + | \
+    sed -e '/loaddefs\|esh-groups/d' -e 's|/[^/]*: "|/|' -e 's/"//g' \
+    >| $tempfile || die "Error finding targets"
 
 genfiles=
 
 while read genfile; do
 
-    [ -r lisp/$genfile ] || die "Unable to read $genfile"
+    ## Or we can just use sort -u when making tempfile...
+    case " $genfiles " in
+        *" $genfile "*) continue ;;
+    esac
+
+    [ -r $genfile ] || die "Unable to read $genfile"
 
     genfiles="$genfiles $genfile"
 done < $tempfile
@@ -369,18 +374,12 @@ make -C lisp "$@" autoloads EMACS=../src/bootstrap-emacs || die "make src error"
     cp $ldefs_in $ldefs_out || die "cp ldefs_boot error"
 
 
-cd lisp
-
 echo "Checking status of loaddef files..."
 
 ## It probably would be fine to just check+commit lisp/, since
 ## making autoloads should not effect any other files.  But better
 ## safe than sorry.
-modified=$(status $genfiles ${ldefs_out#lisp/}) || die
-
-
-## bzr status output is always relative to top-level, not PWD.
-[ "$vcs" = "bzr" ] && cd ../
+modified=$(status $genfiles $ldefs_out) || die
 
 
 commit "loaddefs" $modified || die "commit error"