X-Git-Url: http://git.pk910.de/?p=NeonServV5.git;a=blobdiff_plain;f=src%2Fversion.sh;h=13f84fc8d903432afc0b3d8fa3fcd75eaffb7ac0;hp=e89f996b4063348f1230d8557b2035c1c1f04f4f;hb=c575e458c6257e75b97884847143b20965a5dfda;hpb=2d9db1adb1946aba00b203f40eff7d5db8163f01

diff --git a/src/version.sh b/src/version.sh
index e89f996..13f84fc 100644
--- a/src/version.sh
+++ b/src/version.sh
@@ -20,12 +20,13 @@ else \
 codelines=`find . -type f -regex '\./.*\.h' -or -regex '\./.*\.c' |xargs cat|wc -l`
 
 svn_revision=`svn info | grep Revision | grep -o -E '[0-9]+'`
+git_commitcount=0
 if test "x$svn_revision" = "x" ; then
   svn_revision=`git log -n 1 --pretty="format:%h"`
   if test "x$svn_revision" = "x" ; then
     svn_revision="0"
   else
-    git_commitcount=`git rev-list --all --no-merges | wc -l | sed "s/[ \t]//g"`
+    git_commitcount=`git log --pretty=oneline --no-merges --first-parent | wc -l | sed "s/[ \t]//g"`
     svn_revision="git-$git_commitcount-$svn_revision"
   fi
 else
@@ -34,7 +35,7 @@ fi
 
 
 /bin/cat > version.c <<!SUB!THIS!
-/* version.c - NeonServ v5.1
+/* version.c - NeonServ v5.2
  * Copyright (C) 2011  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -59,5 +60,7 @@ const char *creation = "$creation";
 const char *revision = "$svn_revision";
 const char *codelines = "$codelines";
 
+const int patchlevel = ($git_commitcount ? ($git_commitcount - VERSION_PATCHLEVEL) : 0);
+
 !SUB!THIS!