diff options
| author | Eric Wong <normalperson@yhbt.net> | 2009-05-09 18:42:23 -0700 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2009-05-09 18:42:23 -0700 |
| commit | d94c0c75ee37919300dfd5d56335aca55c4b14a6 (patch) | |
| tree | 61ed57cbec9b9ae923e37baddbf560b5f2213645 | |
| parent | 37a28cb736a120cdf40100d2b00df3570efa4e27 (diff) | |
| download | pcu-d94c0c75ee37919300dfd5d56335aca55c4b14a6.tar.gz | |
Fixup GIT-VERSION-GEN
I don't plan on making release tarballs "by hand" any more. cgit/gitweb will just do it for me.
| -rwxr-xr-x | GIT-VERSION-GEN | 9 | ||||
| -rw-r--r-- | Makefile | 1 |
2 files changed, 3 insertions, 7 deletions
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 4e7f0e3..016c829 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,17 +1,12 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v0.1.0.GIT +DEF_VER=v0.1.1 LF=' ' -# First see if there is a version file (included in release tarballs), -# then try git-describe, then default. -if test -f version -then - VN=$(cat version) || VN="$DEF_VER" -elif test -d .git -o -f .git && +if test -d .git -o -f .git && VN=$(git describe --abbrev=4 HEAD 2>/dev/null) && case "$VN" in *$LF*) (exit 1) ;; @@ -39,5 +39,6 @@ dist: GIT-VERSION-FILE mv $(DISTNAME).tar.gz+ $(DISTNAME).tar.gz clean: $(RM) $(PCU_BIN) $(DISTNAME).tar.gz* + $(RM) GIT-VERSION-FILE .PHONY: .FORCE-GIT-VERSION-FILE |