subtree: fix build with AsciiDoctor 2
This is a (late) companion for f6461b82b93 (Documentation: fix build with Asciidoctor 2, 2019-09-15). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Apr 8, 2020 at 14:25 UTC
826f0c0df2505d21bd217a7962c4ea3fd0531d18
1 file changed
+4
-2
contrib/subtree/Makefile
+4
-2
@@ -25,14 +25,16 @@ ASCIIDOC_HTML = xhtml11
25
ASCIIDOC_DOCBOOK = docbook
26
ASCIIDOC_EXTRA =
27
XMLTO = xmlto
28
+XMLTO_EXTRA =
29
30
ifdef USE_ASCIIDOCTOR
31
ASCIIDOC = asciidoctor
32
ASCIIDOC_CONF =
33
ASCIIDOC_HTML = xhtml5
33
-ASCIIDOC_DOCBOOK = docbook45
34
+ASCIIDOC_DOCBOOK = docbook
35
ASCIIDOC_EXTRA += -I../../Documentation -rasciidoctor-extensions
36
ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;'
37
+XMLTO_EXTRA += --skip-validation
38
endif
39
40
ifndef SHELL_PATH
@@ -78,7 +80,7 @@ install-html: $(GIT_SUBTREE_HTML)
80
$(INSTALL) -m 644 $^ $(DESTDIR)$(htmldir)
81
82
$(GIT_SUBTREE_DOC): $(GIT_SUBTREE_XML)
81
- $(XMLTO) -m $(MANPAGE_XSL) man $^
83
+ $(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $^
84
85
$(GIT_SUBTREE_XML): $(GIT_SUBTREE_TXT)
86
$(ASCIIDOC) -b $(ASCIIDOC_DOCBOOK) -d manpage $(ASCIIDOC_CONF) \