summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Smith <osmith@sysmocom.de>2019-08-30 14:01:41 +0200
committerOliver Smith <osmith@sysmocom.de>2019-08-30 14:15:39 +0200
commit7e1ab03302e525981b31a5a3cb72a95f8c6071e0 (patch)
treec8d204cbfd28d3bb4b75b1e936871e5854a89de2
parent2333c9f0d16d13c6501aa22eea3456e2317ce687 (diff)
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
-rw-r--r--tests/Makefile.am5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b2f579d..6eba2c5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -6,10 +6,11 @@ EXTRA_DIST = test-usermanual-docinfo.xml \
# 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" >> $@