diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-10-17 10:25:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-10-17 10:25:37 -0700 |
| commit | 19100d3f7db17a85dc58265ae5388b1bf483f44f (patch) | |
| tree | 914eee109f39d0cb47358770a5c4839a47976c46 /Documentation | |
| parent | 7703477ab9fcb96ee1d2555c85b7499d8c3d69eb (diff) | |
| parent | dd4f30756150c921ce9acc7b3d0970ff5a6e1158 (diff) | |
| download | git-19100d3f7db17a85dc58265ae5388b1bf483f44f.tar.gz | |
Merge branch 'db/doc-custom-xmlto' into maint
* db/doc-custom-xmlto:
Documentation/Makefile: Allow custom XMLTO binary
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile index cf5916fe8b..267dfe135d 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) $@+ $@ && \ |