diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-06-29 17:01:51 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-06-29 17:01:51 -0700 |
| commit | f9bae01ee8a7be0e4e992ef3ce856b31d32019c9 (patch) | |
| tree | a61be70d562b07db553d2fdcbabaf94cef06b8e5 /admin | |
| parent | 87ed944822b8616396bd1b16257b7f299047c1a3 (diff) | |
| download | emacs-f9bae01ee8a7be0e4e992ef3ce856b31d32019c9.tar.gz | |
* update_autogen: Find loaddefs targets rather than parsing lisp/Makefile.in
* lisp/Makefile.in: Comment.
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/ChangeLog | 5 | ||||
| -rwxr-xr-x | admin/update_autogen | 12 |
2 files changed, 13 insertions, 4 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index fc58259443f..a20e93d38c2 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,8 @@ +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/. diff --git a/admin/update_autogen b/admin/update_autogen index 90431fa6301..ef0edfef50c 100755 --- a/admin/update_autogen +++ b/admin/update_autogen @@ -322,15 +322,19 @@ 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 - genfile=lisp/$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" |