diff options
| author | Werner Koch <wk@gnupg.org> | 2014-08-12 10:36:30 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2014-08-14 09:55:13 +0200 |
| commit | 49c9a958e0b786850309bca555d4465c97d337e1 (patch) | |
| tree | e14505bc2372e6ecaf5e92fd363ba0d80909bcc8 /autogen.sh | |
| parent | gpg: Remove --compress-keys and --compress-sigs feature. (diff) | |
| download | gnupg2-49c9a958e0b786850309bca555d4465c97d337e1.tar.xz gnupg2-49c9a958e0b786850309bca555d4465c97d337e1.zip | |
build: Fix autogen.sh base version hack.
* autogen.sh <find-version>: Fix.
Diffstat (limited to 'autogen.sh')
| -rwxr-xr-x | autogen.sh | 7 |
1 files changed, 4 insertions, 3 deletions
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 |