RE: [PATCH v2 03/11] doc: use asciidoctor to build man pages directly
flat view
From: Felipe Contreras <hidden>
Date: 2021-06-02 20:12:31
Felipe Contreras wrote:
quoted hunk ↗ jump to hunk
--- a/Documentation/Makefile +++ b/Documentation/Makefile
quoted hunk ↗ jump to hunk
@@ -349,8 +352,13 @@ $(MAN_HTML): %.html : %.txt $(ASCIIDOC_DEPS) $(OBSOLETE_HTML): %.html : %.txto $(ASCIIDOC_DEPS) $(QUIET_ASCIIDOC)$(TXT_TO_HTML) -o $@ $< -%.1 %.5 %.7 : %.xml $(wildcard manpage*.xsl) +ifdef TXT_TO_MAN +%.1 %.5 %.7 : %.txt $(ASCIIDOC_DEPS) + $(QUIET_ASCIIDOC)$(TXT_TO_MAN) -o $@ $< +else +%.1 %.5 %.7 : %.xml manpage-base-url.xsl $(wildcard manpage*.xsl) $(QUIET_XMLTO)$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $< +endif
This was a conflict mistake, the manpage-base-url.xsl file is not present any more, should be: +%.1 %.5 %.7 : %.xml $(wildcard manpage*.xsl) I fixed in my local branch. -- Felipe Contreras