build: Fix autogen.sh base version hack.
authorWerner Koch <wk@gnupg.org>
Tue, 12 Aug 2014 08:36:30 +0000 (10:36 +0200)
committerWerner Koch <wk@gnupg.org>
Thu, 14 Aug 2014 07:55:13 +0000 (09:55 +0200)
* autogen.sh <find-version>: Fix.

autogen.sh

index a6b5909..cafecc9 100755 (executable)
@@ -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