aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2012-11-16 09:52:59 +0000
committerWerner Koch <[email protected]>2012-11-16 09:52:59 +0000
commitb2e4d03c88823151aa30f8a878ad1a30618d1340 (patch)
tree9cd209001d3184e19780d7eaec121367e5f8791d
parentFix non-portable use of chmod in autogen.sh. (diff)
downloadlibgpg-error-b2e4d03c88823151aa30f8a878ad1a30618d1340.tar.gz
libgpg-error-b2e4d03c88823151aa30f8a878ad1a30618d1340.zip
Improve parsing of the GIT revision number.
* configure.ac (git_revision): Use git rev-parse.
-rw-r--r--configure.ac4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index ee42f9e..85f9362 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,8 +29,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])])])
AC_INIT([libgpg-error],[my_full_version], [http://bugs.gnupg.org])