mirror of
http://git.haproxy.org/git/haproxy.git/
synced 2024-12-25 06:02:08 +00:00
[BUILD] use "git cmd" instead of "git-cmd"
Newer GIT versions do not support "git-cmd" anymore, so date and version can be wrong during development builds. Use "git cmd" now. Also fix git-tar to use "git archive" instead of "git-tar-tree".
This commit is contained in:
parent
be8c736cca
commit
63076b3f61
4
Makefile
4
Makefile
@ -265,7 +265,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) 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" )
|
||||
@ -522,7 +522,7 @@ tar: clean
|
||||
rm -f haproxy-$(VERSION)
|
||||
|
||||
git-tar: clean
|
||||
git-tar-tree HEAD haproxy-$(VERSION) | gzip -9 > haproxy-$(VERSION)$(SUBVERS).tar.gz
|
||||
git archive --format=tar --prefix="haproxy-$(VERSION)/" HEAD | gzip -9 > haproxy-$(VERSION)$(SUBVERS).tar.gz
|
||||
|
||||
version:
|
||||
@echo "VERSION: $(VERSION)"
|
||||
|
Loading…
Reference in New Issue
Block a user