* admin/update_autogen: Fix bogosity introduced in 2014-11-16 merge.

2 files changed, 5 insertions, 8 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 70961a727a6..091732b40dd 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-01  Glenn Morris  <rgm@gnu.org>
+
+        * update_autogen: Fix bogosity introduced in 2014-11-16 merge.
+
 2014-11-29  Paul Eggert  <eggert@cs.ucla.edu>
 
         Lessen focus on ChangeLog files, as opposed to change log entries.
diff --git a/admin/update_autogen b/admin/update_autogen
index 4c4f52e2d2d..af7ea83dd91 100755
--- a/admin/update_autogen
+++ b/admin/update_autogen
@@ -305,9 +305,6 @@ EOF
 
     modified=$(status $basegen) || die
 
-    ## bzr status output is always relative to top-level, not PWD.
-    [ "$vcs" = "bzr" ] && cd $oldpwd
-
     commit "generated" $modified || die "commit error"
 
     exit 0
@@ -379,11 +376,7 @@ 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"