Avoid unnecessary bootstrap runs in VPATH builds

diff --git a/autogen.sh b/autogen.sh
index c0a1c4ae0d93a83b7e7265c3f350477736af2738..01ba59c0b0a2adde09c443b9626a76cb6f1f8d4f 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -80,7 +80,7 @@ bootstrap_hash()
 curr_status=.git-module-status
 t=$(bootstrap_hash; git diff .gnulib)
 if test "$t" = "$(cat $curr_status 2>/dev/null)" \
-    && test -f "$THEDIR/po/Makevars"; then
+    && test -f "po/Makevars"; then
     # good, it's up to date, all we need is autoreconf
     autoreconf -if
 else

diff --git a/cfg.mk b/cfg.mk
index 7226828a58947ba6ed06f69ca12b0cc14b18f3df..d50ffb7f3e62b14118096112d7c0093d2efb6f6c 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -459,8 +459,8 @@ ifeq (0,$(MAKELEVEL))
   # b653eda3ac4864de205419d9f41eec267cb89eeb
   _submodule_hash = sed 's/^[ +-]//;s/ .*//'
   _update_required := $(shell                                          \
-      test -f po/Makevars || { echo 1; exit; };                                \
       cd '$(srcdir)';                                                  \
+      test -f po/Makevars || { echo 1; exit; };                                \
       actual=$$(git submodule status | $(_submodule_hash);             \
                git hash-object bootstrap.conf;                         \
                git diff .gnulib);                                      \