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>

diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile
index 87797edeb30309533ddb3ed2ce6bbfdb1d12fe18..f63334bd6525b37f37d3c3fad073e16c6d3ae391 100644 (file)
--- a/contrib/subtree/Makefile
+++ b/contrib/subtree/Makefile
@@ -6,7 +6,10 @@ mandir ?= $(prefix)/share/man
 libexecdir ?= $(prefix)/libexec/git-core
 man1dir ?= $(mandir)/man1
 
 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
 
 # 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) \
 
 $(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) \
 
 $(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
 
 test:
        $(MAKE) -C t/ test


@@ -56,3 +59,5 @@ test:
 clean:
        rm -f *~ *.xml *.html *.1
        rm -rf subproj mainline
 clean:
        rm -f *~ *.xml *.html *.1
        rm -rf subproj mainline

+
+.PHONY: FORCE