aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Blake <eblake@redhat.com>2010-04-27 14:39:40 -0600
committerEric Blake <eblake@redhat.com>2010-04-28 08:15:12 -0600
commit5fe816eccdab427ff112da9a61839f731b57325f (patch)
tree268e0faa83bcc7a2dddd8cfec4dcd09fa99877c9
parentMove dnsmasq host file to a separate directory (diff)
downloadlibvirt-5fe816eccdab427ff112da9a61839f731b57325f.tar.gz
libvirt-5fe816eccdab427ff112da9a61839f731b57325f.tar.bz2
libvirt-5fe816eccdab427ff112da9a61839f731b57325f.zip
build: fix autogen rule for VPATH build
* cfg.mk (gnulib_srcdir): Override maint.mk default. (_update_required): Run in correct directory.
-rw-r--r--cfg.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/cfg.mk b/cfg.mk
index 105b62551..d1f84854c 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -24,6 +24,9 @@ gnu_rel_host = $(gnu_ftp_host-$(RELEASE_TYPE))
url_dir_list = \
ftp://$(gnu_rel_host)/gnu/coreutils
+# We use .gnulib, not gnulib.
+gnulib_dir = $(srcdir)/.gnulib
+
# Tests not to run as part of "make distcheck".
local-checks-to-skip = \
changelog-check \
@@ -282,6 +285,7 @@ ifeq (0,$(MAKELEVEL))
# b653eda3ac4864de205419d9f41eec267cb89eeb
_submodule_hash = sed 's/^[ +-]//;s/ .*//'
_update_required := $(shell \
+ cd '$(srcdir)'; \
actual=$$(git submodule status | $(_submodule_hash); \
git hash-object bootstrap.conf; \
git diff .gnulib); \