X-Git-Url: http://git.pk910.de/?p=srvx.git;a=blobdiff_plain;f=src%2FMakefile.am;h=4c20c6fb4844d8be78c27f028046f6c74af9fd0a;hp=75c599ae61c32645e8ee43dc6d45a56b1c2ae9f8;hb=880457f83c5c05dbb54f31d294257f085abd6c58;hpb=c7ac1f35024b9921d892bb47e1a532baffaf9bf3 diff --git a/src/Makefile.am b/src/Makefile.am index 75c599a..4c20c6f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -27,10 +27,13 @@ git-version.c: checkversion if HAS_GIT checkversion: - @GIT_VERSION=`$(GIT) describe`; \ + @GIT_VERSION=`$(GIT) log -n 1 --pretty="format:%h"`; \ [ "z$$GIT_VERSION" != "z" ] || exit 0; \ TMPFILE=`mktemp git-version.c.XXXXXX` || exit 1 ; \ - echo "const char git_version[] = \"$${GIT_VERSION}\";" >> $$TMPFILE ; \ + GIT_LASTCOMMIT=$$GIT_VERSION; \ + GIT_COMMITCOUNT=`$(GIT) rev-list --all | wc -l | sed "s/[ \t]//g"`; \ + GIT_REVISION="git-$${GIT_COMMITCOUNT}-$${GIT_LASTCOMMIT}"; \ + echo "const char git_version[] = \"$${GIT_REVISION}\";" >> $$TMPFILE ; \ if diff -q git-version.c $$TMPFILE >/dev/null 2>&1 ; then \ rm $$TMPFILE ; \ else \ @@ -40,7 +43,7 @@ checkversion: fi else checkversion: - echo "const char git_version[] = \"\";" >> git-version.c ; + echo "const char git_version[] = \"git-0-0\";" >> git-version.c ; endif EXTRA_srvx_SOURCES = \