[PATCH 1/2] Documentation/Makefile: add missing dependencies on asciidoctor-extensions
- From
- Martin Ågren <martin.agren@gmail.com>
- Date
- Mar 10, 2019, 15:14 UTC
- Message-ID
- <7ec45f69fabee22f2a9b4e08c5ba7d88b32814be.1552230490.git.martin.agren@gmail.com>
- In-Reply-To
- <cover.1552230490.git.martin.agren@gmail.com>
I really should have caught this when I wrote 00c87bceaa ("Documentation/Makefile: add missing dependency on asciidoctor-extensions", 2019-02-27). That commit made sure that the xml-files depend on our Asciidoctor-specific extensions, but that just helps for the ".txt -> .xml -> .[157]" transformations.
Because we produce the html-files directly as ".txt -> .html" -- not as ".txt -> .xml -> .html" --, we need to make the html-files too depend on asciidoctor-extensions.rb.
There's one exception to the above paragraph. We do render user-manual.html by going through an intermediate user-manual.xml, which is an explicit, special-cased target. Add the missing dependency to user-manual.xml.
Signed-off-by: Martin Ågren <martin.agren@gmail.com> --- Documentation/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Documentation/Makefile b/Documentation/Makefile index f63c775e88..f58904a929 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -334,12 +334,12 @@ clean: $(RM) $(cmds_txt) $(mergetools_txt) *.made $(RM) manpage-base-url.xsl -$(MAN_HTML): %.html : %.txt asciidoc.conf +$(MAN_HTML): %.html : %.txt asciidoc.conf asciidoctor-extensions.rb $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \ $(TXT_TO_HTML) -d manpage -o $@+ $< && \ mv $@+ $@ -$(OBSOLETE_HTML): %.html : %.txto asciidoc.conf +$(OBSOLETE_HTML): %.html : %.txto asciidoc.conf asciidoctor-extensions.rb $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \ $(TXT_TO_HTML) -o $@+ $< && \ mv $@+ $@ @@ -356,7 +356,7 @@ manpage-base-url.xsl: manpage-base-url.xsl.in $(TXT_TO_XML) -d manpage -o $@+ $< && \ mv $@+ $@ -user-manual.xml: user-manual.txt user-manual.conf +user-manual.xml: user-manual.txt user-manual.conf asciidoctor-extensions.rb $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \ $(TXT_TO_XML) -d book -o $@+ $< && \ mv $@+ $@
-- 2.21.0