undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'js/subtree-doc-update-to-asciidoctor-2'

Browse Source 
Doc markup update.

* js/subtree-doc-update-to-asciidoctor-2:
  subtree: fix build with AsciiDoctor 2
This commit is contained in:
Junio C Hamano 2020-04-28 15:50:03 -07:00
commit 772d785636
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/subtree/Makefile
View File

@ -25,14 +25,16 @@ ASCIIDOC_HTML = xhtml11
ASCIIDOC_DOCBOOK = docbook ASCIIDOC_DOCBOOK = docbook
ASCIIDOC_EXTRA = ASCIIDOC_EXTRA =
XMLTO = xmlto XMLTO = xmlto
XMLTO_EXTRA =
ifdef USE_ASCIIDOCTOR ifdef USE_ASCIIDOCTOR
ASCIIDOC = asciidoctor ASCIIDOC = asciidoctor
ASCIIDOC_CONF = ASCIIDOC_CONF =
ASCIIDOC_HTML = xhtml5 ASCIIDOC_HTML = xhtml5
ASCIIDOC_DOCBOOK = docbook45 ASCIIDOC_DOCBOOK = docbook
ASCIIDOC_EXTRA += -I../../Documentation -rasciidoctor-extensions ASCIIDOC_EXTRA += -I../../Documentation -rasciidoctor-extensions
ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;' ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;'
XMLTO_EXTRA += --skip-validation
endif endif
ifndef SHELL_PATH ifndef SHELL_PATH
@ -78,7 +80,7 @@ install-html: $(GIT_SUBTREE_HTML)
$(INSTALL) -m 644 $^ $(DESTDIR)$(htmldir) $(INSTALL) -m 644 $^ $(DESTDIR)$(htmldir)
$(GIT_SUBTREE_DOC): $(GIT_SUBTREE_XML) $(GIT_SUBTREE_DOC): $(GIT_SUBTREE_XML)
$(XMLTO) -m $(MANPAGE_XSL) man $^ $(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $^
$(GIT_SUBTREE_XML): $(GIT_SUBTREE_TXT) $(GIT_SUBTREE_XML): $(GIT_SUBTREE_TXT)
$(ASCIIDOC) -b $(ASCIIDOC_DOCBOOK) -d manpage $(ASCIIDOC_CONF) \ $(ASCIIDOC) -b $(ASCIIDOC_DOCBOOK) -d manpage $(ASCIIDOC_CONF) \