[MERGED] osmo-gsm-manuals[master]: cosmetic: build: on a2x failure, use asciidoc -v and $ASCIID...

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Harald Welte gerrit-no-reply at lists.osmocom.org
Tue Oct 18 17:23:29 UTC 2016


Harald Welte has submitted this change and it was merged.

Change subject: cosmetic: build: on a2x failure, use asciidoc -v and $ASCIIDOC_OPTS
......................................................................


cosmetic: build: on a2x failure, use asciidoc -v and $ASCIIDOC_OPTS

This is only used to output warnings in case the a2x build failed.
Use ASCIIDOC_OPTS instead of repeating the same options (with one missing)
and add verbose output by asciidoc.

Change-Id: I6135ba1a3e46610eea6089e2218f1024c49054be
---
M build/Makefile.asciidoc.inc
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc
index f95cd0b..fad91fa 100644
--- a/build/Makefile.asciidoc.inc
+++ b/build/Makefile.asciidoc.inc
@@ -30,7 +30,7 @@
 all: $(ASCIIDOCPDFS)
 
 $(ASCIIDOCPDFS): %.pdf: %.adoc %-docinfo.xml $(ASCIIDOCSTYLE) $(TOPDIR)/common/chapters/*.adoc
-	a2x $(A2X_OPTS) $< || asciidoc -f $(BUILDDIR)/mscgen-filter.conf -f $(BUILDDIR)/diag-filter.conf $<
+	a2x $(A2X_OPTS) $< || asciidoc -v $(ASCIIDOC_OPTS) $<
 
 check: $(ASCIIDOC_CHECKS)
 

-- 
To view, visit https://gerrit.osmocom.org/1110
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6135ba1a3e46610eea6089e2218f1024c49054be
Gerrit-PatchSet: 3
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder



More information about the gerrit-log mailing list