From 5f9c828ed31bd100bd3dc4356b644828a2b8fe68 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Wed, 18 Jun 2008 22:33:37 -0600 Subject: [PATCH] Fix VPATH 'make dist' with GNU make and non-VCS tarball. * top/GNUmakefile (_curr-ver): Don't use $(srcdir) unnecessarily. Reported by Stepan Kasal. Signed-off-by: Eric Blake --- ChangeLog | 6 ++++++ top/GNUmakefile | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6fd636246..d84e4975f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-06-19 Eric Blake + + Fix VPATH 'make dist' with GNU make and non-VCS tarball. + * top/GNUmakefile (_curr-ver): Don't use $(srcdir) unnecessarily. + Reported by Stepan Kasal. + 2008-06-18 Bruno Haible * lib/fatal-signal.c (init_fatal_signals): Add comment. diff --git a/top/GNUmakefile b/top/GNUmakefile index 062900b54..31bd873fa 100644 --- a/top/GNUmakefile +++ b/top/GNUmakefile @@ -56,8 +56,8 @@ ifeq ($(_have-git-version-gen)0,yes$(MAKELEVEL)) _is-dist-target = $(filter-out %clean, \ $(filter maintainer-% dist% alpha beta major,$(MAKECMDGOALS))) ifneq (,$(_is-dist-target)) - _curr-ver := $(shell cd $(srcdir) && ./$(_build-aux)/git-version-gen \ - $(srcdir)/.tarball-version) + _curr-ver := $(shell cd $(srcdir) \ + && $(_build-aux)/git-version-gen .tarball-version) ifneq ($(_curr-ver),$(VERSION)) ifeq ($(_curr-ver),UNKNOWN) $(info WARNING: unable to verify if $(VERSION) is correct version) -- 2.11.0