Change in ...osmo-gsm-manuals[master]: tests/Makefile.am: always put glossary at the end

osmith gerrit-no-reply at lists.osmocom.org
Fri Aug 30 12:12:19 UTC 2019


osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15351


Change subject: tests/Makefile.am: always put glossary at the end
......................................................................

tests/Makefile.am: always put glossary at the end

Make sure that glossary.adoc is the last file, when building the test
pdf with all common chapters included. Otherwise, newer asciidoc
versions will complain that we cannot have subchapters after the
glossary began:

asciidoc: ERROR: mgcp_extension_osmux.adoc: line 2: glossary section cannot contain sub-sections

Related: OS#4183
Change-Id: I91e857255b1b6d5b8708cc7f7b303a58403120d3
---
M tests/Makefile.am
1 file changed, 3 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/51/15351/1

diff --git a/tests/Makefile.am b/tests/Makefile.am
index b2f579d..a88fe00 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -6,10 +6,11 @@
 # Do not install any of the test pdfs
 OSMO_GSM_MANUALS_NO_INSTALL = 1
 
-# Generate adoc file that includes all chapters
+# Generate adoc file that includes all chapters (OS#4183: glossary.adoc must be the last file)
 ASCIIDOC = test-usermanual.adoc
 ASCIIDOC_DEPS =
-COMMON_CHAPTERS = $(shell find $(OSMO_GSM_MANUALS_DIR)/common/chapters -name '*.adoc')
+COMMON_CHAPTERS := $(shell find $(OSMO_GSM_MANUALS_DIR)/common/chapters -name '*.adoc' | grep -v glossary\.adoc) \
+		   $(OSMO_GSM_MANUALS_DIR)/common/chapters/glossary.adoc
 $(ASCIIDOC): $(COMMON_CHAPTERS)
 	echo ":gfdl-enabled:" > $@
 	echo ":program-name: Test" >> $@

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15351
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Change-Id: I91e857255b1b6d5b8708cc7f7b303a58403120d3
Gerrit-Change-Number: 15351
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190830/7ff6e0e6/attachment.html>


More information about the gerrit-log mailing list