From: Guus Sliepen Date: Tue, 5 May 2015 21:03:41 +0000 (+0200) Subject: Remove "release-" from displayed git version. X-Git-Tag: release-1.1pre12~178 X-Git-Url: https://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=c46bdbde18629f0a0613c776c13a79fea0ec6093;p=tinc Remove "release-" from displayed git version. Also make sure that version_git.h is only written to if the "git describe" command succeeds. --- diff --git a/src/Makefile.am b/src/Makefile.am index cc512b1c..3b9843af 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,7 +6,7 @@ sbin_PROGRAMS = tincd tinc sptps_test sptps_keypair .PHONY: version.c version_git.h version_git.h: echo >$@ - -GIT_DESCRIPTION="`cd $(@D) && git describe`" && echo "#define GIT_DESCRIPTION \"$$GIT_DESCRIPTION\"" >$@ + -git describe && echo '#define GIT_DESCRIPTION "'`git describe | sed 's/release-//'`'"' >$@ version.c: version_git.h if LINUX