subtree: honour USE_ASCIIDOCTOR when set
Defining USE_ASCIIDOCTOR=1 when building Git uses asciidoctor over asciidoc when generating DocBook and man page documentation. However, the contrib/subtree module does not presently honour that flag. This causes a build failure when asciidoc is not present on the build system. Instead, adapt the main Documentation/Makefile logic to use asciidoctor when requested. Signed-off-by: A. Wilcox <AWilcox@Wilcox-Tech.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
A. Wilcox committed
Jun 27, 2017 at 21:49 UTC
fdc1ad97c1fc31cb276a37c2e63ed88716b76269
1 file changed
+19
-7
contrib/subtree/Makefile
+19
-7
@@ -19,15 +19,27 @@ htmldir ?= $(prefix)/share/doc/git-doc
19
INSTALL ?= install
20
RM ?= rm -f
21
22
-ASCIIDOC = asciidoc
23
-XMLTO = xmlto
22
+ASCIIDOC = asciidoc
23
+ASCIIDOC_CONF = -f ../../Documentation/asciidoc.conf
24
+ASCIIDOC_HTML = xhtml11
25
+ASCIIDOC_DOCBOOK = docbook
26
+ASCIIDOC_EXTRA =
27
+XMLTO = xmlto
28
+
29
+ifdef USE_ASCIIDOCTOR
30
+ASCIIDOC = asciidoctor
31
+ASCIIDOC_CONF =
32
+ASCIIDOC_HTML = xhtml5
33
+ASCIIDOC_DOCBOOK = docbook45
34
+ASCIIDOC_EXTRA += -I../../Documentation -rasciidoctor-extensions
35
+ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;'
36
+endif
37
38
ifndef SHELL_PATH
39
SHELL_PATH = /bin/sh
40
endif
41
SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
42
30
-ASCIIDOC_CONF = ../../Documentation/asciidoc.conf
43
MANPAGE_XSL = ../../Documentation/manpage-normal.xsl
44
45
GIT_SUBTREE_SH := git-subtree.sh
@@ -65,12 +77,12 @@ $(GIT_SUBTREE_DOC): $(GIT_SUBTREE_XML)
77
$(XMLTO) -m $(MANPAGE_XSL) man $^
78
79
$(GIT_SUBTREE_XML): $(GIT_SUBTREE_TXT)
68
- $(ASCIIDOC) -b docbook -d manpage -f $(ASCIIDOC_CONF) \
69
- -agit_version=$(GIT_VERSION) $^
80
+ $(ASCIIDOC) -b $(ASCIIDOC_DOCBOOK) -d manpage $(ASCIIDOC_CONF) \
81
+ -agit_version=$(GIT_VERSION) $(ASCIIDOC_EXTRA) $^
82
83
$(GIT_SUBTREE_HTML): $(GIT_SUBTREE_TXT)
72
- $(ASCIIDOC) -b xhtml11 -d manpage -f $(ASCIIDOC_CONF) \
73
- -agit_version=$(GIT_VERSION) $^
84
+ $(ASCIIDOC) -b $(ASCIIDOC_HTML) -d manpage $(ASCIIDOC_CONF) \
85
+ -agit_version=$(GIT_VERSION) $(ASCIIDOC_EXTRA) $^
86
87
$(GIT_SUBTREE_TEST): $(GIT_SUBTREE)
88
cp $< $@