| Message ID | pull.600.git.1586355949189.gitgitgadget@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | subtree: fix build with AsciiDoctor 2 | expand |
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com> writes: > From: Johannes Schindelin <johannes.schindelin@gmx.de> > > 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> > --- > Adjust contrib/subtree to AsciiDoctor 2, too > > This is something I had to do because the Git for Windows release > process now offers only AsciiDoctor 2. Thanks. The original justifies its change quite well, and its reasoning applies perfectly well here, too. > Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-600%2Fdscho%2Fsubtree-and-docbook-v1 > Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-600/dscho/subtree-and-docbook-v1 > Pull-Request: https://github.com/gitgitgadget/git/pull/600 > > contrib/subtree/Makefile | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile > index 6906aae4414..6fa7496bfdb 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) \ > > base-commit: 9fadedd637b312089337d73c3ed8447e9f0aa775
diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile index 6906aae4414..6fa7496bfdb 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) \