From: Willy Tarreau <w@1wt.eu>
Date: Sun, 17 Dec 2006 23:15:06 +0000 (+0100)
Subject: [BUILD] fixed the "git-tar" target in the Makefile
X-Git-Tag: v1.3.4~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c21aa083df0fd6ba442c3f17c7fbf2ee96de3f2c;p=thirdparty%2Fhaproxy.git

[BUILD] fixed the "git-tar" target in the Makefile

The git-tar target did not work correctly anymore, probably because
of a recent change in the output of "git-describe --tags". This is
now fixed.
---

diff --git a/Makefile b/Makefile
index f690a14af3..77470a5d46 100644
--- a/Makefile
+++ b/Makefile
@@ -183,6 +183,6 @@ tar:	clean
 	rm -f haproxy-$(VERSION)
 
 git-tar: clean
-	ref=$(shell git-describe --tags); ver=$${ref#v};\
-	comms=$(shell git-log $$ref..|grep -c ^commit); \
+	ref=$$(git-describe --tags); ref=$${ref%-g*}; ver=$${ref#v};\
+	comms=$$(git-log $$ref..|grep -c ^commit); \
 	git-tar-tree HEAD haproxy-$(VERSION) | gzip -9 > haproxy-$$ver-$$comms.tar.gz