From 8e8bed586554b6c16c0991ababe4a5aead8c6e53 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sun, 3 Sep 2017 07:30:08 +0200 Subject: [PATCH] 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 --- configure.ac | 2 +- src/client/configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 87bde72e..69102a5f 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 $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]) diff --git a/src/client/configure.ac b/src/client/configure.ac index b911fe7d..92550908 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 $srcdir/.tarball-version]), + m4_esyscmd([cat .tarball-version]), [wolfpack@wolfpackempire.com],, [http://www.wolfpackempire.com/]) AC_CONFIG_SRCDIR([empire.6])