RE: [PATCH v2 03/11] doc: use asciidoctor to build man pages directly

From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Jun 2, 2021, 20:11 UTC
Message-ID: <60b7e5e1748a5_1690a3208cb@natae.notmuch>
In-Reply-To: <20210521224452.530852-4-felipe.contreras@gmail.com>

Felipe Contreras wrote:

> --- a/Documentation/Makefile
> +++ b/Documentation/Makefile

Show 12 quoted lines

> @@ -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