From ece998e06458c09358da361bb0c516de8b9228ce Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 2 Sep 2017 14:23:28 +0200 Subject: [PATCH] configure: Fix .tarball-version access from separate build tree configure reads .tarball-version when the source tree isn't git-controlled. Fails when the build tree is separate. Fix it to read $srcdir/.tarball-version. The occurence in Make.mk isn't wrong, because VPATH applies there. Change it anyway, for consistency and a bit of extra robustness. Signed-off-by: Markus Armbruster --- Make.mk | 2 +- configure.ac | 6 +++--- src/client/configure.ac | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Make.mk b/Make.mk index 421c82dbb..b08596470 100644 --- a/Make.mk +++ b/Make.mk @@ -342,7 +342,7 @@ $(srcdir)/.tarball-version: $(src) v=`sed -e 's/-dirty$$//' <$@`; echo "$$v-dirty" >$@ # Force Make to start over after updating .tarball-version, so that # $(version) gets the new value -$(srcdir)/.dirty-stamp: .tarball-version +$(srcdir)/.dirty-stamp: $(srcdir)/.tarball-version >$@ include $(srcdir)/.dirty-stamp endif diff --git a/configure.ac b/configure.ac index cb6b09e39..87bde72ed 100644 --- a/configure.ac +++ b/configure.ac @@ -38,7 +38,7 @@ AC_PREREQ(2.69) AC_INIT([Wolfpack Empire], - m4_esyscmd([build-aux/git-version-gen .tarball-version]), + m4_esyscmd([build-aux/git-version-gen $srcdir/.tarball-version]), [wolfpack@wolfpackempire.com], [empire], [http://www.wolfpackempire.com/]) AC_CONFIG_SRCDIR([include/combat.h]) @@ -64,8 +64,8 @@ if test -d $srcdir/.git then revctrl=git else revctrl= fi -if test "$revctrl" && test -r .tarball-version -then AC_MSG_ERROR([.tarball-version must not exist]) +if test "$revctrl" && test -r $srcdir/.tarball-version +then AC_MSG_ERROR([$srcdir/.tarball-version must not exist]) fi AC_SUBST(revctrl,$revctrl) diff --git a/src/client/configure.ac b/src/client/configure.ac index e92286702..b911fe7d4 100644 --- a/src/client/configure.ac +++ b/src/client/configure.ac @@ -38,7 +38,7 @@ AC_PREREQ(2.69) AC_INIT([Wolfpack Empire Client], - m4_esyscmd([cat .tarball-version]), + m4_esyscmd([cat $srcdir/.tarball-version]), [wolfpack@wolfpackempire.com],, [http://www.wolfpackempire.com/]) AC_CONFIG_SRCDIR([empire.6]) @@ -91,7 +91,7 @@ MY_WITH_TERMINFO ### Output -AC_DEFINE_UNQUOTED(VERSION, "`cat .tarball-version`", [Tarball version]) +AC_DEFINE_UNQUOTED(VERSION, "`cat $srcdir/.tarball-version`", [Tarball version]) AC_CONFIG_FILES([Makefile ipglob.c]) AC_OUTPUT -- 2.43.0