empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

configure: Fix botched fix of .tarball-version access

Browse source 
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>
This commit is contained in:
Markus Armbruster 2017-09-03 07:30:08 +02:00
parent e87bef161f
commit 8e8bed5865
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -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])

2
src/client/configure.ac
View file

@ -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])