On 08/10/2010 08:59 AM, Jiri Denemark wrote: My apologies for not properly testing VPATH builds; my regression was commit 5f211d4b. It turns out that gettext creates po/Makevars in $(srcdir) unconditionally, even for VPATH builds. This patch is one way to do it, but the other, simpler way, would be to swap the two lines, and check for po/Makevars after the cd: _update_required := $(shell \ - test -f po/Makevars || { echo 1; exit; }; \ cd '$(srcdir)'; \ + test -f po/Makevars || { echo 1; exit; }; \ ACK to whichever version you think looks nicer. -- Eric Blake eblake(a)redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org

--- OK, this should be the complete fix. I like your option better. Jirka autogen.sh | 2 +- cfg.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/autogen.sh b/autogen.sh index c0a1c4a..01ba59c 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 7226828..d50ffb7 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); \ -- 1.7.2