]> xenbits.xensource.com Git - people/dariof/libvirt.git/commitdiff
build: rerun bootstrap if AUTHORS is missing
authorEric Blake <eblake@redhat.com>
Wed, 14 Nov 2012 20:20:55 +0000 (13:20 -0700)
committerEric Blake <eblake@redhat.com>
Wed, 14 Nov 2012 20:41:15 +0000 (13:41 -0700)
Ever since commit 7b21981c started generating AUTHORS, we now have
the situation that if you flip between two branches in the same
git repository that cross that commit boundary, then 'make' will
fail due to automake complaining about AUTHORS not existing.  The
simplest solution is to realize that if AUTHORS does not exist,
then we flipped branches so we will need to rerun bootstrap
anyways; and rerunning bootstrap ensures AUTHORS will exist in time.

* cfg.mk (_update_required): Also depend on AUTHORS.

cfg.mk

diff --git a/cfg.mk b/cfg.mk
index 802e94efed719d6e4258133b4c4eef49eccf058f..ec4ab1c59d52f35e69407c4e6405be8af5bbb2c9 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -696,6 +696,7 @@ ifeq (0,$(MAKELEVEL))
       cd '$(srcdir)';                                                  \
       test -d .git || { echo 0; exit; };                               \
       test -f po/Makevars || { echo 1; exit; };                                \
+      test -f AUTHORS || { echo 1; exit; };                            \
       actual=$$(git submodule status | $(_submodule_hash);             \
                git hash-object bootstrap.conf;                         \
                git ls-tree -d HEAD gnulib/local | awk '{print $$3}';   \