Include lightweight tags for beta numbering
authorAndre Heinecke <aheinecke@intevation.de>
Thu, 29 Aug 2013 10:24:24 +0000 (10:24 +0000)
committerAndre Heinecke <aheinecke@intevation.de>
Thu, 29 Aug 2013 10:24:24 +0000 (10:24 +0000)
    After moving the 2.2.0 tag it was no longer an annotated tag.

    * configure.ac

--
    I found this solution more attractive then moving the tag yet
    again. For the next release I'll try to remember to annotate/sign
    the tag.

configure.ac

index e1615c7..f3f8e0d 100644 (file)
@@ -38,8 +38,8 @@ m4_define([git_revision],
 m4_define([git_revision_dec],
           m4_esyscmd_s([echo $((0x$(echo ]git_revision[|head -c 4)))]))
 m4_define([git_betastring],
-          m4_esyscmd_s([git describe --match 'gpg4win-[0-9].*.*[0-9]' --long|\
-                        awk -F- '$3!=0{print"-beta"$3}']))
+          m4_esyscmd_s([git describe --tags --match 'gpg4win-[0-9].*.*[0-9]' \
+                       --long | awk -F- '$3!=0{print"-beta"$3}']))
 m4_define([my_isgit],m4_if(git_betastring,[],[no],[yes]))
 m4_define([my_full_version],[my_version[]git_betastring])