From: Eric Blake <ebb9@byu.net>
Date: Thu, 20 Mar 2008 15:24:13 +0000 (-0600)
Subject: VPATH fix.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b7bf418dde380e1d311ee68338a75182f2f4080;p=pspp

VPATH fix.

* build-aux/GNUmakefile (_have_git-version-gen): Look in correct dir.

Signed-off-by: Eric Blake <ebb9@byu.net>
---

diff --git a/ChangeLog b/ChangeLog
index 490b40e754..4d31c2a131 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-20  Eric Blake  <ebb9@byu.net>
+
+	VPATH fix.
+	* build-aux/GNUmakefile (_have_git-version-gen): Look in correct dir.
+
 2008-03-20  Simon Josefsson  <simon@josefsson.org>
 
 	* build-aux/GNUmakefile: Make git-version-gen optional.  Add
diff --git a/build-aux/GNUmakefile b/build-aux/GNUmakefile
index a9d6196dad..d30f13b505 100644
--- a/build-aux/GNUmakefile
+++ b/build-aux/GNUmakefile
@@ -40,18 +40,17 @@ 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
 
+# Allow cfg.mk to override these.
+_build-aux ?= build-aux
 _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.
-_have-git-version-gen := $(shell test -f ./$(_build-aux)/git-version-gen && echo yes)
+_have-git-version-gen := $(shell test -f $(srcdir)/$(_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)))