Let development version be BRANCH.SHORTHASH

Previously the version of a master-based development build was something
like 3.7.1+NNN_gSHORTHASH which is a bit misleading.

diff --git a/dev.mk.in b/dev.mk.in
index 07c14b267c9b4aec972d67cb65f48202651fe0dd..70ad15a1dbf55361b7021d3c5c88fbdfb22b11ac 100644 (file)
--- a/dev.mk.in
+++ b/dev.mk.in
@@ -17,9 +17,11 @@ SHELLCHECK = shellcheck
 SHELLCHECK_EXCLUDES = misc/shellcheck-excludes.txt
 TEST = test
 
+git := git --git-dir=$(srcdir)/.git
 version := \
-    $(shell (git --git-dir=$(srcdir)/.git describe --dirty || git --git-dir=$(srcdir)/.git describe || echo vunknown) \
-            2>/dev/null | sed -e 's/v//' -e 's/-/+/' -e 's/-/_/g')
+    $(shell ($(git) describe --exact-match \
+             || echo "$$($(git) rev-parse --abbrev-ref HEAD).$$($(git) rev-parse HEAD | cut -c1-8)") 2>/dev/null \
+            | sed -re 's/^v([0-9].+)/\1/')
 
 dist_dir = ccache-$(version)
 dist_archives = \