Avoid unnecessary bootstrap runs in VPATH builds

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

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);					\