From 2d5d6c54e85c2fef4d7b59cc0b88caa42ec38e4d Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Fri, 2 Aug 2019 11:09:01 +0200 Subject: [PATCH] Makefile.asciidoc.inc: always run verbose asciidoc a2x is a "toolchain manager" for asciidoc, that runs the asciidoc command internally. Replace the previous logic of first running a2x without any verbose flags, and on failure running asciidoc standalone, with a verbose flag, to print the errors the occured. Always run a2x with -vv, so it runs asciidoc in verbose mode. This prevents losing the error message in case asciidoc or a2x fail when running with a2x, but then asciidoc succeeds when running standalone. Related: OS#4132 Change-Id: I2cbd2985645ecdecc7851849be6a9a95d4b3246e --- build/Makefile.asciidoc.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc index 1bed968..77f3b1d 100644 --- a/build/Makefile.asciidoc.inc +++ b/build/Makefile.asciidoc.inc @@ -73,8 +73,7 @@ $(ASCIIDOC_PDF): %.pdf: %.adoc %-docinfo.xml \ and remove three lines starting with '% \"DRAFT\" on first page'\n" \ || true TEXINPUTS="$(OSMO_GSM_MANUALS_DIR)" \ - a2x $(A2X_OPTS) $(notdir $<) || (echo "ERROR: a2x failed! Running asciidoc to get verbose errors..."; \ - asciidoc -v $(ASCIIDOC_OPTS) $(notdir $<); exit 1) + a2x -vv $(A2X_OPTS) $(notdir $<) check: $(ASCIIDOC_CHECKS)