security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

build: Fix autogen.sh base version hack. 

* autogen.sh <find-version>: Fix.
This commit is contained in:
Werner Koch 2014-08-12 10:36:30 +02:00
parent 71b55e91f0
commit 49c9a958e0
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
autogen.sh
View File

@ -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