configure: Fix botched fix of .tarball-version access

Commit ece998e fixed .tarball-version access from separate build tree
by adding $srcdir/ to it.  That's wrong in m4_esyscmd(), because there
it runs at autoconf time, where $srcdir isn't necessary and doesn't
exist.  Revert that part.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>

diff --git a/configure.ac b/configure.ac
index 87bde72ed8fd491a8eba36bbc13cf2b8cc615374..69102a5fa0c47afcb0085ad1890436eeb07ca303 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 $srcdir/.tarball-version]),
+       m4_esyscmd([build-aux/git-version-gen .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])

diff --git a/src/client/configure.ac b/src/client/configure.ac
index b911fe7d4212162acfea827274f0e177e69cf732..925509086f4777eb18e21d1f68bb9d26596c4f41 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 $srcdir/.tarball-version]),
+       m4_esyscmd([cat .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])