From 0b9d46f883dc8796c33f3d8496e7e795b71a2497 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Wed, 7 Nov 2018 15:08:56 +0100 Subject: Makefile.asciidoc.inc: always exit 1 on a2x error a2x wraps asciidoc. When a2x fails, we run asciidoc without a2x to print verbose output. Make sure that 'make' fails at this point, even if asciidoc runs through. Change-Id: I30931303ecc6094efaedcb08380433a34211a169 --- build/Makefile.asciidoc.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc index a28a5bb..ee7a60d 100644 --- a/build/Makefile.asciidoc.inc +++ b/build/Makefile.asciidoc.inc @@ -57,7 +57,8 @@ $(ASCIIDOC_PDF): %.pdf: %.adoc %-docinfo.xml \ NOTE: TO REMOVE DRAFT MODE, YOU NEED TO EDIT build/custom-dblatex.sty\n\ and remove three lines starting with '% \"DRAFT\" on first page'\n" \ || true - a2x $(A2X_OPTS) $< || asciidoc -v $(ASCIIDOC_OPTS) $< + a2x $(A2X_OPTS) $< || (echo "ERROR: a2x failed! Running asciidoc to get verbose errors..."; \ + asciidoc -v $(ASCIIDOC_OPTS) $<; exit 1) check: $(ASCIIDOC_CHECKS) -- cgit v1.2.3