From de03e1efe4903dbcda84a8a2491cc9e1eeef210b Mon Sep 17 00:00:00 2001
From: Luca Deri <deri@ntop.org>
Date: Thu, 21 May 2015 19:33:35 +0200
Subject: Modified GIT version format as shown ndpiReader -r

---
 configure.ac         | 6 ++++--
 example/ndpiReader.c | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index eba84e705..598c0a22b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,9 +10,11 @@ AC_PROG_CC
 AX_PTHREAD
 
 if test -d ".git"; then :
-     GIT_TAG=`git log -1 --format=%H`
+     GIT_TAG=`git log -1 --format=%h`
      GIT_DATE=`git log -1 --format=%cd`
-     GIT_RELEASE=`git describe --tags --long --dirty --always`
+     GIT_NUM=`git rev-list HEAD --count`
+     GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`
+     GIT_RELEASE="${PACKAGE_VERSION}-${GIT_BRANCH}-${GIT_NUM}-${GIT_TAG}"
 else
      GIT_RELEASE="${PACKAGE_VERSION}"
      GIT_DATE=`date`
diff --git a/example/ndpiReader.c b/example/ndpiReader.c
index 50ace72b1..558d204ed 100644
--- a/example/ndpiReader.c
+++ b/example/ndpiReader.c
@@ -273,7 +273,7 @@ static void parseOptions(int argc, char **argv) {
       break;
 
     case 'r':
-      printf("ndpiReader, nDPI (%s)\n\n", ndpi_revision());
+      printf("ndpiReader - nDPI (%s)\n", ndpi_revision());
       exit(0);
 
     case 'v':
-- 
cgit v1.2.3