From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Thu, 18 May 2017 09:27:02 +0000 (+0200)
Subject: Use un-annotated tags for determining version
X-Git-Tag: rec-4.1.0-alpha1~116^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F5331%2Fhead;p=thirdparty%2Fpdns.git

Use un-annotated tags for determining version
---

diff --git a/build-aux/gen-version b/build-aux/gen-version
index c2d71ae9ea..c40fc159c1 100755
--- a/build-aux/gen-version
+++ b/build-aux/gen-version
@@ -24,7 +24,7 @@ fi
 if [ ! -z "$(git rev-parse --abbrev-ref HEAD 2> /dev/null)" ]; then
   if $(git rev-parse --abbrev-ref HEAD | grep -q 'rel/'); then
     REL_TYPE="$(git rev-parse --abbrev-ref HEAD | cut -d/ -f 2 | cut -d- -f 1)"
-    VERSION="$(git describe --match=${REL_TYPE}-* --dirty=.dirty | cut -d- -f 2-)"
+    VERSION="$(git describe --match=${REL_TYPE}-* --tags --dirty=.dirty | cut -d- -f 2-)"
   else
     GIT_VERSION=$(git show --no-patch --format=format:%h HEAD)
     BRANCH=".$(git rev-parse --abbrev-ref HEAD | perl -p -e 's/[^[:alnum:]]//g;')"