undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

contrib/subtree/Makefile: use GIT-VERSION-FILE

Browse Source 
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>
This commit is contained in:
James Denholm 2014-05-06 22:41:46 +10:00 committed by Junio C Hamano
parent 3330311c91
commit 8e2a5ccad1
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
contrib/subtree/Makefile
View File

@ -6,7 +6,10 @@ mandir ?= $(prefix)/share/man
libexecdir ?= $(prefix)/libexec/git-core libexecdir ?= $(prefix)/libexec/git-core
man1dir ?= $(mandir)/man1 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 # this should be set to a 'standard' bsd-type install program
INSTALL ?= install INSTALL ?= install
@ -44,11 +47,11 @@ $(GIT_SUBTREE_DOC): $(GIT_SUBTREE_XML)
$(GIT_SUBTREE_XML): $(GIT_SUBTREE_TXT) $(GIT_SUBTREE_XML): $(GIT_SUBTREE_TXT)
asciidoc -b docbook -d manpage -f $(ASCIIDOC_CONF) \ asciidoc -b docbook -d manpage -f $(ASCIIDOC_CONF) \
-agit_version=$(gitver) $^ -agit_version=$(GIT_VERSION) $^
$(GIT_SUBTREE_HTML): $(GIT_SUBTREE_TXT) $(GIT_SUBTREE_HTML): $(GIT_SUBTREE_TXT)
asciidoc -b xhtml11 -d manpage -f $(ASCIIDOC_CONF) \ asciidoc -b xhtml11 -d manpage -f $(ASCIIDOC_CONF) \
-agit_version=$(gitver) $^ -agit_version=$(GIT_VERSION) $^
test: test:
$(MAKE) -C t/ test $(MAKE) -C t/ test
@ -56,3 +59,5 @@ test:
clean: clean:
rm -f *~ *.xml *.html *.1 rm -f *~ *.xml *.html *.1
rm -rf subproj mainline rm -rf subproj mainline
.PHONY: FORCE