Simplify release parsing, add +git into git package versions

diff --git a/Makefile b/Makefile
index abf4bf465fd06af7546a570c1bc93e019b7c3134..9306d5398a35a3106dd41325909fef0d512a65ee 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -59,8 +59,8 @@ ifeq "$(RADIUS_VERSION_STRING)" ""
 endif
 
 ifeq "$(RADIUS_VERSION_RELEASE)" ""
-  RADIUSD_VERSION_RELEASE := $(shell git status > /dev/null 2>&1 && git describe | sed -e 's/^.*-\([[0-9]]*\)-g[[0-9a-f]]*/\1/')
-  RADIUSD_PACKAGE_VERSION := $(RADIUSD_VERSION_STRING)-$(RADIUSD_VERSION_RELEASE)
+  RADIUSD_VERSION_RELEASE := $(shell git status > /dev/null 2>&1 && git describe | cut -d '-' -f 2)
+  RADIUSD_PACKAGE_VERSION := $(RADIUSD_VERSION_STRING)+git$(RADIUSD_VERSION_RELEASE)
 else
   RADIUSD_PACKAGE_VERSION := $(RADIUSD_VERSION_STRING)
 endif

diff --git a/configure.ac b/configure.ac
index 3772bffb1bf6fedb093bffcae52e77341b70c6f9..598a6a6203c1d7426f1318f5403617c49ca779a3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -153,7 +153,7 @@ dnl #
 if test "x$GIT" = "xyes" && git status 2>&1 > /dev/null; then
   if test "x$RADIUSD_VERSION_RELEASE" = "x"; then
     AC_MSG_CHECKING([build release])
-    RADIUSD_VERSION_RELEASE=`git describe | sed -e 's/^.*-\([[0-9]]*\)-g[[0-9a-f]]*/\1/'`
+    RADIUSD_VERSION_RELEASE=`git describe | cut -d '-' -f 2`
     AC_MSG_RESULT($RADIUSD_VERSION_RELEASE)
   fi