summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Smith <osmith@sysmocom.de>2019-08-02 11:09:01 +0200
committerlaforge <laforge@gnumonks.org>2019-08-05 17:50:35 +0000
commit2d5d6c54e85c2fef4d7b59cc0b88caa42ec38e4d (patch)
tree288616edb003f4eda165314dc6da79a9fe0a9c49
parent35ca68b762cc33fbcca095c1da64a61fe3db98b0 (diff)
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
-rw-r--r--build/Makefile.asciidoc.inc3
1 files changed, 1 insertions, 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)