summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-10-17 17:25:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-10-17 17:25:37 (GMT)
commit19100d3f7db17a85dc58265ae5388b1bf483f44f (patch)
tree914eee109f39d0cb47358770a5c4839a47976c46
parent7703477ab9fcb96ee1d2555c85b7499d8c3d69eb (diff)
parentdd4f30756150c921ce9acc7b3d0970ff5a6e1158 (diff)
downloadgit-19100d3f7db17a85dc58265ae5388b1bf483f44f.zip
git-19100d3f7db17a85dc58265ae5388b1bf483f44f.tar.gz
git-19100d3f7db17a85dc58265ae5388b1bf483f44f.tar.bz2
Merge branch 'db/doc-custom-xmlto' into maint
* db/doc-custom-xmlto: Documentation/Makefile: Allow custom XMLTO binary
-rw-r--r--Documentation/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile
index cf5916f..267dfe1 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -44,9 +44,10 @@ man5dir=$(mandir)/man5
man7dir=$(mandir)/man7
# DESTDIR=
-ASCIIDOC=asciidoc
+ASCIIDOC = asciidoc
ASCIIDOC_EXTRA =
MANPAGE_XSL = manpage-normal.xsl
+XMLTO = xmlto
XMLTO_EXTRA =
INSTALL?=install
RM ?= rm -f
@@ -245,7 +246,7 @@ manpage-base-url.xsl: manpage-base-url.xsl.in
%.1 %.5 %.7 : %.xml manpage-base-url.xsl
$(QUIET_XMLTO)$(RM) $@ && \
- xmlto -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
+ $(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
%.xml : %.txt
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \