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>
James Denholm committed
May 6, 2014 at 22:41 UTC
8e2a5ccad11bc21eb72499133bc884024e299983
1 file changed
+8
-3
contrib/subtree/Makefile
+8
-3
@@ -6,7 +6,10 @@ mandir ?= $(prefix)/share/man
6
libexecdir ?= $(prefix)/libexec/git-core
7
man1dir ?= $(mandir)/man1
8
9
-gitver ?= $(word 3,$(shell git --version))
9
+../../GIT-VERSION-FILE: FORCE
10
+ $(MAKE) -C ../../ GIT-VERSION-FILE
11
+
12
+-include ../../GIT-VERSION-FILE
13
14
# this should be set to a 'standard' bsd-type install program
15
INSTALL ?= install
@@ -44,11 +47,11 @@ $(GIT_SUBTREE_DOC): $(GIT_SUBTREE_XML)
47
48
$(GIT_SUBTREE_XML): $(GIT_SUBTREE_TXT)
49
asciidoc -b docbook -d manpage -f $(ASCIIDOC_CONF) \
47
- -agit_version=$(gitver) $^
50
+ -agit_version=$(GIT_VERSION) $^
51
52
$(GIT_SUBTREE_HTML): $(GIT_SUBTREE_TXT)
53
asciidoc -b xhtml11 -d manpage -f $(ASCIIDOC_CONF) \
51
- -agit_version=$(gitver) $^
54
+ -agit_version=$(GIT_VERSION) $^
55
56
test:
57
$(MAKE) -C t/ test
@@ -56,3 +59,5 @@ test:
59
clean:
60
rm -f *~ *.xml *.html *.1
61
rm -rf subproj mainline
62
+
63
+.PHONY: FORCE