From: Simon Josefsson <simon@josefsson.org>
Date: Thu, 20 Mar 2008 14:50:57 +0000 (+0100)
Subject: Make git-version-gen optional.  Add _build-aux variable.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=216173c7d70cbd66f8791b6710cb8f8c3bf6eef9;p=pspp

Make git-version-gen optional.  Add _build-aux variable.
---

diff --git a/ChangeLog b/ChangeLog
index 85d2587617..490b40e754 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-20  Simon Josefsson  <simon@josefsson.org>
+
+	* build-aux/GNUmakefile: Make git-version-gen optional.  Add
+	_build-aux variable.  Suggested by Eric Blake <ebb9@byu.net>.
+
 2008-03-20  Eric Blake  <ebb9@byu.net>
 
 	Sync GNUmakefile with coreutils.
diff --git a/build-aux/GNUmakefile b/build-aux/GNUmakefile
index fac11d3d02..a9d6196dad 100644
--- a/build-aux/GNUmakefile
+++ b/build-aux/GNUmakefile
@@ -40,6 +40,9 @@ export TAR_OPTIONS = --owner=0 --group=0 --numeric-owner
 
 include Makefile
 
+# Allow cfg.mk to override this.
+_build-aux ?= build-aux
+
 # Some projects override e.g., _autoreconf here.
 -include $(srcdir)/cfg.mk
 include $(srcdir)/maint.mk
@@ -48,11 +51,12 @@ _autoreconf ?= autoreconf
 
 # Ensure that $(VERSION) is up to date for dist-related targets, but not
 # for others: rerunning autoreconf and recompiling everything isn't cheap.
-ifeq (0,$(MAKELEVEL))
+_have-git-version-gen := $(shell test -f ./$(_build-aux)/git-version-gen && echo yes)
+ifeq ($(_have-git-version-gen)0,yes$(MAKELEVEL))
   _is-dist-target = $(filter-out %clean, \
     $(filter dist% alpha beta major,$(MAKECMDGOALS)))
   ifneq (,$(_is-dist-target))
-    _curr-ver := $(shell cd $(srcdir) && ./build-aux/git-version-gen \
+    _curr-ver := $(shell cd $(srcdir) && ./$(_build-aux)/git-version-gen \
                    $(srcdir)/.tarball-version)
     ifneq ($(_curr-ver),$(VERSION))
       $(info INFO: running autoreconf for new version string: $(_curr-ver))