diff options
| -rwxr-xr-x | GIT-VERSION-GEN | 10 | ||||
| -rw-r--r-- | Makefile | 4 |
2 files changed, 11 insertions, 3 deletions
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 845b9dce6..7763639a8 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,9 +1,15 @@ #!/bin/sh GVF=GIT-VERSION-FILE +DEF_VER=v1.1.GIT -VN=$(git-describe --abbrev=4 HEAD 2>/dev/null) || VN=v1.0.GIT -VN=$(expr "$VN" : v'\(.*\)') +# First try git-describe, then see if there is a version file +# (included in release tarballs), then default +VN=$(git-describe --abbrev=4 HEAD 2>/dev/null) || +VN=$(cat version) || +VN="$DEF_VER" + +VN=$(expr "$VN" : v*'\(.*\)') if test -r $GVF then VC=$(sed -e 's/^GIT_VERSION = //' <$GVF) @@ -489,7 +489,9 @@ dist: git.spec git-tar-tree ./git-tar-tree HEAD $(GIT_TARNAME) > $(GIT_TARNAME).tar @mkdir -p $(GIT_TARNAME) @cp git.spec $(GIT_TARNAME) - $(TAR) rf $(GIT_TARNAME).tar $(GIT_TARNAME)/git.spec + @echo $(GIT_VERSION) > $(GIT_TARNAME)/version + $(TAR) rf $(GIT_TARNAME).tar \ + $(GIT_TARNAME)/git.spec $(GIT_TARNAME)/version @rm -rf $(GIT_TARNAME) gzip -f -9 $(GIT_TARNAME).tar |