From 49c9a958e0b786850309bca555d4465c97d337e1 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Tue, 12 Aug 2014 10:36:30 +0200
Subject: build: Fix autogen.sh base version hack.

* autogen.sh <find-version>: Fix.
---
 autogen.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'autogen.sh')

diff --git a/autogen.sh b/autogen.sh
index a6b5909b1..cafecc970 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -216,9 +216,10 @@ if [ "$myhost" = "find-version" ]; then
     beta=no
     if [ -d .git ]; then
       ingit=yes
-      tmp=$(git describe --match "${matchstr1}" --long 2>/dev/null \
-            | awk -F- '$3!=0 && $3 !~ /^beta/ {print"-beta"$3}' )
-      if [ -z "$tmp" ]; then
+      tmp=$(git describe --match "${matchstr1}" --long 2>/dev/null)
+      if [ -n "$tmp" ]; then
+          tmp=$(echo "$tmp"|awk -F- '$3!=0 && $3 !~ /^beta/ {print"-beta"$3}')
+      else
           tmp=$(git describe --match "${matchstr2}" --long 2>/dev/null \
                 | awk -F- '$4!=0{print"-beta"$4}')
       fi
-- 
cgit v1.2.3