diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-04-28 22:50:03 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-28 22:50:03 (GMT) |
| commit | 772d78563697c39d5d35d090cb2b5724a1812e7f (patch) | |
| tree | e7efd20da899af90fd1fc69d73d5473ebceaf070 /contrib | |
| parent | 0ccf0bafff5759c821f0f2aba0a63c567007d6a7 (diff) | |
| parent | 826f0c0df2505d21bd217a7962c4ea3fd0531d18 (diff) | |
| download | git-772d78563697c39d5d35d090cb2b5724a1812e7f.zip git-772d78563697c39d5d35d090cb2b5724a1812e7f.tar.gz git-772d78563697c39d5d35d090cb2b5724a1812e7f.tar.bz2 | |
Merge branch 'js/subtree-doc-update-to-asciidoctor-2'
Doc markup update.
* js/subtree-doc-update-to-asciidoctor-2:
subtree: fix build with AsciiDoctor 2
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/subtree/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile index 6906aae..6fa7496 100644 --- a/contrib/subtree/Makefile +++ b/contrib/subtree/Makefile @@ -25,14 +25,16 @@ ASCIIDOC_HTML = xhtml11 ASCIIDOC_DOCBOOK = docbook ASCIIDOC_EXTRA = XMLTO = xmlto +XMLTO_EXTRA = ifdef USE_ASCIIDOCTOR ASCIIDOC = asciidoctor ASCIIDOC_CONF = ASCIIDOC_HTML = xhtml5 -ASCIIDOC_DOCBOOK = docbook45 +ASCIIDOC_DOCBOOK = docbook ASCIIDOC_EXTRA += -I../../Documentation -rasciidoctor-extensions ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;' +XMLTO_EXTRA += --skip-validation endif ifndef SHELL_PATH @@ -78,7 +80,7 @@ install-html: $(GIT_SUBTREE_HTML) $(INSTALL) -m 644 $^ $(DESTDIR)$(htmldir) $(GIT_SUBTREE_DOC): $(GIT_SUBTREE_XML) - $(XMLTO) -m $(MANPAGE_XSL) man $^ + $(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $^ $(GIT_SUBTREE_XML): $(GIT_SUBTREE_TXT) $(ASCIIDOC) -b $(ASCIIDOC_DOCBOOK) -d manpage $(ASCIIDOC_CONF) \ |