Make git return the last tag from git-describe

Makefile.in

@@ -22,7 +22,7 @@ COMMIT_FULL 	:= $(shell git log -1 --pretty=format:%H HEAD)
 COMMIT_SHORT 	:= $(shell git log -1 --pretty=format:%h HEAD)
 BRANCH 		:= $(shell git branch --no-color | grep "^*" | sed -e 's/^\* //')
 BUILDTS 	:= $(shell git log -1 --pretty=format:%ct HEAD)
-VERSION 	:= $(shell git describe)
+VERSION 	:= $(shell git describe --candidates=2)
 DISTRIB = wraith-$(VERSION)
 
 HELPFILE = doc/help.txt

build.sh

@@ -4,7 +4,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:${HOME}/bin
 
 if [ -d .git ]; then
   BUILDTS=$(git log -1 --pretty=format:%ct HEAD)
-  ver=$(git describe)
+  ver=$(git describe --candidates=2)
 else
   ver=$(awk '/^VERSION/ {print $3}' Makefile.in)
   BUILDTS=`grep -m 1 "BUILDTS = " Makefile.in | awk '{print $3}'`