summaryrefslogtreecommitdiff
path: root/Documentation/Makefile
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-10-06 12:25:16 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-10-06 12:25:16 +0900
commitfaf5576a8d749c7c46fafd0c62da47ec078e1486 (patch)
tree75bd7cb59dd5b83229c2bd2ca5586534086bb0e2 /Documentation/Makefile
parentMerge branch 'ma/asciidoctor-more-fixes' (diff)
parentDocumentation: fix build with Asciidoctor 2 (diff)
downloadtgif-faf5576a8d749c7c46fafd0c62da47ec078e1486.tar.xz
Merge branch 'bc/doc-use-docbook-5'
Start using DocBook 5 (instead of DocBook 4.5) as Asciidoctor 2.0 no longer works with the older one. * bc/doc-use-docbook-5: Documentation: fix build with Asciidoctor 2
Diffstat (limited to 'Documentation/Makefile')
-rw-r--r--Documentation/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile
index e7015c307c..06d85ad958 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -198,11 +198,13 @@ ifdef USE_ASCIIDOCTOR
ASCIIDOC = asciidoctor
ASCIIDOC_CONF =
ASCIIDOC_HTML = xhtml5
-ASCIIDOC_DOCBOOK = docbook45
+ASCIIDOC_DOCBOOK = docbook5
ASCIIDOC_EXTRA += -acompat-mode -atabsize=8
ASCIIDOC_EXTRA += -I. -rasciidoctor-extensions
ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;'
DBLATEX_COMMON =
+XMLTO_EXTRA += --skip-validation
+XMLTO_EXTRA += -x manpage.xsl
endif
SHELL_PATH ?= $(SHELL)