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

configure: Fix .tarball-version access from separate build tree

Browse source 
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>
This commit is contained in:
Markus Armbruster 2017-09-02 14:23:28 +02:00
parent 74396d7fbf
commit ece998e064
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Make.mk
View file

@ -342,7 +342,7 @@ $(srcdir)/.tarball-version: $(src)
v=`sed -e 's/-dirty$$//' <$@`; echo "$$v-dirty" >$@ v=`sed -e 's/-dirty$$//' <$@`; echo "$$v-dirty" >$@
# Force Make to start over after updating .tarball-version, so that # Force Make to start over after updating .tarball-version, so that
# $(version) gets the new value # $(version) gets the new value
$(srcdir)/.dirty-stamp: .tarball-version $(srcdir)/.dirty-stamp: $(srcdir)/.tarball-version
>$@ >$@
include $(srcdir)/.dirty-stamp include $(srcdir)/.dirty-stamp
endif endif

6
configure.ac
View file

@ -38,7 +38,7 @@
AC_PREREQ(2.69) AC_PREREQ(2.69)
AC_INIT([Wolfpack Empire], 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], [wolfpack@wolfpackempire.com], [empire],
[http://www.wolfpackempire.com/]) [http://www.wolfpackempire.com/])
AC_CONFIG_SRCDIR([include/combat.h]) AC_CONFIG_SRCDIR([include/combat.h])
@ -64,8 +64,8 @@ if test -d $srcdir/.git
then revctrl=git then revctrl=git
else revctrl= else revctrl=
fi fi
if test "$revctrl" && test -r .tarball-version if test "$revctrl" && test -r $srcdir/.tarball-version
then AC_MSG_ERROR([.tarball-version must not exist]) then AC_MSG_ERROR([$srcdir/.tarball-version must not exist])
fi fi
AC_SUBST(revctrl,$revctrl) AC_SUBST(revctrl,$revctrl)

4
src/client/configure.ac
View file

@ -38,7 +38,7 @@
AC_PREREQ(2.69) AC_PREREQ(2.69)
AC_INIT([Wolfpack Empire Client], AC_INIT([Wolfpack Empire Client],
m4_esyscmd([cat .tarball-version]), m4_esyscmd([cat $srcdir/.tarball-version]),
[wolfpack@wolfpackempire.com],, [wolfpack@wolfpackempire.com],,
[http://www.wolfpackempire.com/]) [http://www.wolfpackempire.com/])
AC_CONFIG_SRCDIR([empire.6]) 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_CONFIG_FILES([Makefile ipglob.c])
AC_OUTPUT AC_OUTPUT