From: Michael Poole <mdpoole@troilus.org>
Date: Sun, 11 Mar 2007 15:36:31 +0000 (-0400)
Subject: Make prettier git versions.
X-Git-Tag: v1.4.0-rc1~60
X-Git-Url: http://git.pk910.de/?p=srvx.git;a=commitdiff_plain;h=b78dd41ac380362285852878d19ff323c087aee7

Make prettier git versions.

src/Makefile.am (checkversion): Use "git describe" to get the git version.
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 34456de..7386004 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,16 +22,10 @@ if HAS_GIT
 .PHONY: checkversion
 git-version.h: checkversion
 checkversion:
-	@( cd $(top_srcdir) && $(GIT) symbolic-ref HEAD ) >/dev/null 2>&1 || exit 0; \
+	@GIT_VERSION=`$(GIT) describe`; \
+	[ "z$$GIT_VERSION" != "z" ] || exit 0; \
 	TMPFILE=`mktemp git-version.h.XXXXXX` || exit 1 ; \
-	( \
-	  cd $(top_srcdir) ; \
-	  GIT_DIR=$${GIT_DIR:-.git} ; \
-	  HEAD_NAME=`$(GIT) symbolic-ref HEAD` ; \
-	  HEAD_SHA1=`cat $${GIT_DIR}/$${HEAD_NAME}` ; \
-	  echo "/* Full revision $${HEAD_SHA1} */" ; \
-	  echo "#define GIT_VERSION \"$${HEAD_SHA1%????????????????????????????????}\"" ; \
-	) >> $$TMPFILE ; \
+	echo "#define GIT_VERSION \"$${GIT_VERSION}\"" >> $$TMPFILE ; \
 	if diff -q git-version.h $$TMPFILE >/dev/null 2>&1 ; then \
 	    rm $$TMPFILE ; \
         else \