contrib/subtree/Makefile: clean up rules to generate documentation
git:Documentation/Makefile establishes asciidoc/xmlto calls as being handled through their appropriate variables, Hence, change to bring into congruency with. Similarly, MANPAGE_XSL exists in git:Documentation/Makefile, while MANPAGE_NORMAL_XSL does not outside contrib/subtree. Hence, replace MANPAGE_NORMAL_XSL with MANPAGE_XSL. 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
c7abbb986387470512080b162574c99cd7991aa7
1 file changed
+8
-5
contrib/subtree/Makefile
+8
-5
@@ -14,8 +14,11 @@ man1dir ?= $(mandir)/man1
14
# this should be set to a 'standard' bsd-type install program
15
INSTALL ?= install
16
17
-ASCIIDOC_CONF = ../../Documentation/asciidoc.conf
18
-MANPAGE_NORMAL_XSL = ../../Documentation/manpage-normal.xsl
17
+ASCIIDOC = asciidoc
18
+XMLTO = xmlto
19
+
20
+ASCIIDOC_CONF = ../../Documentation/asciidoc.conf
21
+MANPAGE_XSL = ../../Documentation/manpage-normal.xsl
22
23
GIT_SUBTREE_SH := git-subtree.sh
24
GIT_SUBTREE := git-subtree
@@ -43,14 +46,14 @@ install-man: $(GIT_SUBTREE_DOC)
46
$(INSTALL) -m 644 $^ $(DESTDIR)$(man1dir)
47
48
$(GIT_SUBTREE_DOC): $(GIT_SUBTREE_XML)
46
- xmlto -m $(MANPAGE_NORMAL_XSL) man $^
49
+ $(XMLTO) -m $(MANPAGE_XSL) man $^
50
51
$(GIT_SUBTREE_XML): $(GIT_SUBTREE_TXT)
49
- asciidoc -b docbook -d manpage -f $(ASCIIDOC_CONF) \
52
+ $(ASCIIDOC) -b docbook -d manpage -f $(ASCIIDOC_CONF) \
53
-agit_version=$(GIT_VERSION) $^
54
55
$(GIT_SUBTREE_HTML): $(GIT_SUBTREE_TXT)
53
- asciidoc -b xhtml11 -d manpage -f $(ASCIIDOC_CONF) \
56
+ $(ASCIIDOC) -b xhtml11 -d manpage -f $(ASCIIDOC_CONF) \
57
-agit_version=$(GIT_VERSION) $^
58
59
test: