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 <armbru@pond.sub.org>

diff --git a/Make.mk b/Make.mk
index 421c82dbbad0ca8641b434afa5c66d7a12bdbbee..b08596470c682b07bbf0c8d808bea73e5d92f810 100644 (file)
--- 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
        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
        >$@
 include $(srcdir)/.dirty-stamp
 endif

diff --git a/configure.ac b/configure.ac
index cb6b09e39166f862a20d06535d1529d31201e666..87bde72ed8fd491a8eba36bbc13cf2b8cc615374 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -38,7 +38,7 @@
 
 AC_PREREQ(2.69)
 AC_INIT([Wolfpack Empire],
 
 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])
        [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
 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)
 
 fi
 AC_SUBST(revctrl,$revctrl)
 

diff --git a/src/client/configure.ac b/src/client/configure.ac
index e92286702d15ecd5bd13a03625a9bdc9d305b9fb..b911fe7d4212162acfea827274f0e177e69cf732 100644 (file)
--- a/src/client/configure.ac
+++ b/src/client/configure.ac
@@ -38,7 +38,7 @@
 
 AC_PREREQ(2.69)
 AC_INIT([Wolfpack Empire Client],
 
 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])
        [wolfpack@wolfpackempire.com],,
        [http://www.wolfpackempire.com/])
 AC_CONFIG_SRCDIR([empire.6])


@@ -91,7 +91,7 @@ MY_WITH_TERMINFO
 
 ### Output
 
 
 ### 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
 
 AC_CONFIG_FILES([Makefile ipglob.c])
 AC_OUTPUT