summaryrefslogtreecommitdiff
path: root/contrib/subtree
diff options
context:
space:
mode:
authorJames Denholm <nod.helm@gmail.com>2014-05-06 12:41:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-05-06 22:35:31 (GMT)
commit8e2a5ccad11bc21eb72499133bc884024e299983 (patch)
treeb8f626eb9f210cda728c5b28318e6398c613fded /contrib/subtree
parent3330311c91124ff0f42996b02335d45bf7c75a31 (diff)
downloadgit-8e2a5ccad11bc21eb72499133bc884024e299983.zip
git-8e2a5ccad11bc21eb72499133bc884024e299983.tar.gz
git-8e2a5ccad11bc21eb72499133bc884024e299983.tar.bz2
contrib/subtree/Makefile: use GIT-VERSION-FILE
GVF is already being used in most/all other makefiles in the project, and has been for _quite_ a while. Hence, drop file-unique gitver and replace with GIT_VERSION. Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: James Denholm <nod.helm@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/subtree')
-rw-r--r--contrib/subtree/Makefile11
1 files changed, 8 insertions, 3 deletions
diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile
index 87797ed..f63334b 100644
--- a/contrib/subtree/Makefile
+++ b/contrib/subtree/Makefile
@@ -6,7 +6,10 @@ mandir ?= $(prefix)/share/man
libexecdir ?= $(prefix)/libexec/git-core
man1dir ?= $(mandir)/man1
-gitver ?= $(word 3,$(shell git --version))
+../../GIT-VERSION-FILE: FORCE
+ $(MAKE) -C ../../ GIT-VERSION-FILE
+
+-include ../../GIT-VERSION-FILE
# this should be set to a 'standard' bsd-type install program
INSTALL ?= install
@@ -44,11 +47,11 @@ $(GIT_SUBTREE_DOC): $(GIT_SUBTREE_XML)
$(GIT_SUBTREE_XML): $(GIT_SUBTREE_TXT)
asciidoc -b docbook -d manpage -f $(ASCIIDOC_CONF) \
- -agit_version=$(gitver) $^
+ -agit_version=$(GIT_VERSION) $^
$(GIT_SUBTREE_HTML): $(GIT_SUBTREE_TXT)
asciidoc -b xhtml11 -d manpage -f $(ASCIIDOC_CONF) \
- -agit_version=$(gitver) $^
+ -agit_version=$(GIT_VERSION) $^
test:
$(MAKE) -C t/ test
@@ -56,3 +59,5 @@ test:
clean:
rm -f *~ *.xml *.html *.1
rm -rf subproj mainline
+
+.PHONY: FORCE