* admin/update_autogen: Remove need to cd into/out of lisp/.

2 files changed, 5 insertions, 8 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index d0df1ccc5b0..fc58259443f 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,5 +1,7 @@
 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.
 
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"