summaryrefslogtreecommitdiff
path: root/admin/update_autogen
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2014-06-28 18:33:32 -0700
committerGlenn Morris <rgm@gnu.org>2014-06-28 18:33:32 -0700
commit51a0825e8488f6f48f03e11a8d51e49d353b19bf (patch)
treea2e3d148f61678f255d2fdd09bec4d0497ba2c28 /admin/update_autogen
parenta1212016dbebd2f9ad398a56d9b1e16f380a0ede (diff)
downloademacs-51a0825e8488f6f48f03e11a8d51e49d353b19bf.tar.gz
* admin/update_autogen: Remove need to cd into/out of lisp/.
Diffstat (limited to 'admin/update_autogen')
-rwxr-xr-xadmin/update_autogen11
1 files changed, 3 insertions, 8 deletions
diff --git a/admin/update_autogen b/admin/update_autogen
index d9d34fa3d6e..90431fa6301 100755
--- a/admin/update_autogen
+++ b/admin/update_autogen
@@ -330,7 +330,8 @@ genfiles=
while read genfile; do
- [ -r lisp/$genfile ] || die "Unable to read $genfile"
+ genfile=lisp/$genfile
+ [ -r $genfile ] || die "Unable to read $genfile"
genfiles="$genfiles $genfile"
done < $tempfile
@@ -369,18 +370,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"