diff build-aux/git-version-gen @ 17960:1c04e5182252

git-version-gen: revert "detect untagged revisions" Revert commit bedd7833 as it breaks `make dist` in Inetutils at least, due to the interdependencies with top/GNUMakefile, which depend on the tag prefixes. This results in `make dist` inducing a new call to autoconf where a simple tar-ball build would be expected.
author Mats Erik Andersson <mats.andersson@gisladisker.se>
date Tue, 14 Apr 2015 21:25:59 +0100
parents 5abf0a6de129
children 31b2239ca59c
line wrap: on
line diff
--- a/build-aux/git-version-gen	Tue Apr 14 11:47:52 2015 +0100
+++ b/build-aux/git-version-gen	Tue Apr 14 21:25:59 2015 +0100
@@ -189,16 +189,12 @@
     v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`;
     v_from_git=1
 elif test "x$fallback" = x || git --version >/dev/null 2>&1; then
-    if v=g`git describe --always HEAD 2>/dev/null`; then
-	v_from_git=1
-    else
-	v=UNKNOWN
-    fi
+    v=UNKNOWN
 else
     v=$fallback
 fi
 
-v=`echo "$v" | sed "s/^$prefix//"`
+v=`echo "$v" |sed "s/^$prefix//"`
 
 # Test whether to append the "-dirty" suffix only if the version
 # string we're using came from git.  I.e., skip the test if it's "UNKNOWN"