]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
[BUILD] fixed the "git-tar" target in the Makefile
authorWilly Tarreau <w@1wt.eu>
Sun, 17 Dec 2006 23:15:06 +0000 (00:15 +0100)
committerWilly Tarreau <w@1wt.eu>
Sun, 17 Dec 2006 23:15:06 +0000 (00:15 +0100)
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.

Makefile

index f690a14af3fff150d48f504292e792ee5cc3fa79..77470a5d465e3e9799c5a9e89913657d8c70ea0c 100644 (file)
--- 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