From: Willy Tarreau <w@1wt.eu>
Date: Sat, 7 Aug 2010 20:26:20 +0000 (+0200)
Subject: [BUILD] always match official tags when doing git-tar
X-Git-Tag: v1.5-dev8~532
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=01312690f73a4c2cbd802a191889051a37b38861;p=thirdparty%2Fhaproxy.git

[BUILD] always match official tags when doing git-tar
---

diff --git a/Makefile b/Makefile
index f306a81dc6..c042314fcc 100644
--- a/Makefile
+++ b/Makefile
@@ -274,7 +274,7 @@ endif
 # holding the same names in the current directory.
 
 ifeq ($(IGNOREGIT),)
-VERSION := $(shell [ -d .git/. ] && ref=`(git describe --tags) 2>/dev/null` && ref=$${ref%-g*} && echo "$${ref\#v}")
+VERSION := $(shell [ -d .git/. ] && ref=`(git describe --tags --match 'v*') 2>/dev/null` && ref=$${ref%-g*} && echo "$${ref\#v}")
 ifneq ($(VERSION),)
 # OK git is there and works.
 SUBVERS := $(shell comms=`git log --no-merges v$(VERSION).. 2>/dev/null |grep -c ^commit `; [ $$comms -gt 0 ] && echo "-$$comms" )