From: Jiri Denemark <jdenemar@redhat.com>
Date: Tue, 10 Aug 2010 14:58:16 +0000 (+0200)
Subject: Avoid unnecessary bootstrap runs in VPATH builds
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=0495fe59ad0b761681b7227db91d8ee2d212efe1;p=libvirt.git

Avoid unnecessary bootstrap runs in VPATH builds
---

diff --git a/autogen.sh b/autogen.sh
index c0a1c4ae0d..01ba59c0b0 100755
--- 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 7226828a58..d50ffb7f3e 100644
--- 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);					\