Skip to content

Commit

Permalink
contrib/subtree/Makefile: use GIT-VERSION-FILE
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
James Denholm authored and Junio C Hamano committed May 6, 2014
1 parent 3330311 commit 8e2a5cc
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions contrib/subtree/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -44,15 +47,17 @@ $(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

clean:
rm -f *~ *.xml *.html *.1
rm -rf subproj mainline

.PHONY: FORCE

0 comments on commit 8e2a5cc

Please sign in to comment.