aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2013-07-19 11:56:24 +0000
committerWerner Koch <[email protected]>2013-07-25 08:37:40 +0000
commitfd86f3031161f11c3cbef643a213a04c821364dd (patch)
tree2c370bc61e3f511016ac57830d3e3c65d45608f9
parentgpg: fix previous change (diff)
downloadgnupg-fd86f3031161f11c3cbef643a213a04c821364dd.tar.gz
gnupg-fd86f3031161f11c3cbef643a213a04c821364dd.zip
Fix git revision parsing.
* configure.ac: Use git rev-parse to retrieve the revision. Signed-off-by: Werner Koch <[email protected]>
-rw-r--r--configure.ac4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index bbf6e65b5..0154271dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,8 +30,8 @@ m4_define([my_issvn], [yes])
m4_define([svn_revision], m4_esyscmd([printf "%d" $(svn info 2>/dev/null \
| sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
-m4_define([git_revision], m4_esyscmd([git branch -v 2>/dev/null \
- | awk '/^\* / {printf "%s",$3}']))
+m4_define([git_revision],
+ m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r']))
m4_define([my_full_version], [my_version[]m4_if(my_issvn,[yes],
[m4_if(git_revision,[],[-svn[]svn_revision],[-git[]git_revision])])])