<p>osmith <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11796">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Pau Espin Pedrol: Looks good to me, approved
Neels Hofmeyr: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">s/TOPDIR/OSMO_GSM_MANUALS_DIR/g<br><br>Replace TOPDIR with OSMO_GSM_MANUALS_DIR. When the project specific<br>manuals will be built out of this repository, we still need to refer to<br>the top directory of the shared content. But it will be in another<br>repository, so we need to rename the variable to avoid confusion.<br><br>(moving manuals to project repositories 3/19)<br><br>Related: OS#3385<br>Change-Id: I2af797546de048a6ab19a5cbc755e5e15575d7ab<br>---<br>M OsmoBSC/Makefile<br>M OsmoBTS/Makefile<br>M OsmoGGSN/Makefile<br>M OsmoGSMTester/Makefile<br>M OsmoHLR/Makefile<br>M OsmoMGCP/Makefile<br>M OsmoMGW/Makefile<br>M OsmoMSC/Makefile<br>M OsmoNAT/Makefile<br>M OsmoNITB/Makefile<br>M OsmoPCU/Makefile<br>M OsmoSGSN/Makefile<br>M OsmoSIPConnector/Makefile<br>M OsmoSTP/Makefile<br>M OsmoTRX/Makefile<br>M OsmocomBB/Makefile<br>M build/Makefile.asciidoc.inc<br>M build/Makefile.docbook.inc<br>M build/Makefile.vty-reference.inc<br>M tests/Makefile<br>20 files changed, 88 insertions(+), 88 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/OsmoBSC/Makefile b/OsmoBSC/Makefile</span><br><span>index b9f50d0..422c598 100644</span><br><span>--- a/OsmoBSC/Makefile</span><br><span>+++ b/OsmoBSC/Makefile</span><br><span>@@ -1,11 +1,11 @@</span><br><span style="color: hsl(0, 100%, 40%);">-TOPDIR = ..</span><br><span style="color: hsl(120, 100%, 40%);">+OSMO_GSM_MANUALS_DIR = ..</span><br><span> </span><br><span> ASCIIDOC = osmobsc-usermanual.adoc osmux-reference.adoc aoip-mgw-options.adoc</span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.asciidoc.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc</span><br><span> osmobsc-usermanual.pdf: chapters/*.adoc chapters/*.dot</span><br><span> aoip-mgw-options.pdf: aoip-mgw-options.adoc mgw/*.msc</span><br><span> </span><br><span> VTY_REFERENCE = osmobsc-vty-reference.xml</span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.vty-reference.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.common.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc</span><br><span>diff --git a/OsmoBTS/Makefile b/OsmoBTS/Makefile</span><br><span>index e1ff214..536ed17 100644</span><br><span>--- a/OsmoBTS/Makefile</span><br><span>+++ b/OsmoBTS/Makefile</span><br><span>@@ -1,12 +1,12 @@</span><br><span style="color: hsl(0, 100%, 40%);">-TOPDIR = ..</span><br><span style="color: hsl(120, 100%, 40%);">+OSMO_GSM_MANUALS_DIR = ..</span><br><span> </span><br><span> ASCIIDOC = osmobts-usermanual.adoc osmobts-abis.adoc rtp-amr.adoc</span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.asciidoc.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc</span><br><span> osmobts-usermanual.pdf: chapters/*.adoc</span><br><span> osmobts-abis.pdf: abis/*.adoc abis/*.msc</span><br><span> rtp-amr.pdf: dtx.dot</span><br><span> </span><br><span> VTY_REFERENCE = osmobts-vty-reference.xml</span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.vty-reference.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.common.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc</span><br><span>diff --git a/OsmoGGSN/Makefile b/OsmoGGSN/Makefile</span><br><span>index e809632..dce2b02 100644</span><br><span>--- a/OsmoGGSN/Makefile</span><br><span>+++ b/OsmoGGSN/Makefile</span><br><span>@@ -1,10 +1,10 @@</span><br><span style="color: hsl(0, 100%, 40%);">-TOPDIR = ..</span><br><span style="color: hsl(120, 100%, 40%);">+OSMO_GSM_MANUALS_DIR = ..</span><br><span> </span><br><span> ASCIIDOC = osmoggsn-usermanual.adoc</span><br><span> ASCIIDOC_DEPS = chapters/*.adoc</span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.asciidoc.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc</span><br><span> </span><br><span> VTY_REFERENCE = osmoggsn-vty-reference.xml</span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.vty-reference.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.common.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc</span><br><span>diff --git a/OsmoGSMTester/Makefile b/OsmoGSMTester/Makefile</span><br><span>index 43c5a37..4fe6748 100644</span><br><span>--- a/OsmoGSMTester/Makefile</span><br><span>+++ b/OsmoGSMTester/Makefile</span><br><span>@@ -1,7 +1,7 @@</span><br><span style="color: hsl(0, 100%, 40%);">-TOPDIR = ..</span><br><span style="color: hsl(120, 100%, 40%);">+OSMO_GSM_MANUALS_DIR = ..</span><br><span> </span><br><span> ASCIIDOC = osmo-gsm-tester-manual.adoc</span><br><span> ASCIIDOC_DEPS = chapters/*.adoc</span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.asciidoc.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.common.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc</span><br><span>diff --git a/OsmoHLR/Makefile b/OsmoHLR/Makefile</span><br><span>index 234a48c..321c2a1 100644</span><br><span>--- a/OsmoHLR/Makefile</span><br><span>+++ b/OsmoHLR/Makefile</span><br><span>@@ -1,13 +1,13 @@</span><br><span style="color: hsl(0, 100%, 40%);">-TOPDIR = ..</span><br><span style="color: hsl(120, 100%, 40%);">+OSMO_GSM_MANUALS_DIR = ..</span><br><span> </span><br><span> ASCIIDOC = osmohlr-usermanual.adoc</span><br><span> ASCIIDOC_DEPS = chapters/*.adoc *.vty *.ctrl</span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.asciidoc.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc</span><br><span> </span><br><span> VTY_REFERENCE = osmohlr-vty-reference.xml</span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.vty-reference.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.common.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc</span><br><span> </span><br><span> OSMO_HLR_PATH ?= ../../osmo-hlr</span><br><span> TMP_DB = generated/hlr.db</span><br><span>diff --git a/OsmoMGCP/Makefile b/OsmoMGCP/Makefile</span><br><span>index e2a5e37..d47f390 100644</span><br><span>--- a/OsmoMGCP/Makefile</span><br><span>+++ b/OsmoMGCP/Makefile</span><br><span>@@ -1,6 +1,6 @@</span><br><span style="color: hsl(0, 100%, 40%);">-TOPDIR = ..</span><br><span style="color: hsl(120, 100%, 40%);">+OSMO_GSM_MANUALS_DIR = ..</span><br><span> </span><br><span> VTY_REFERENCE = osmomgcp-vty-reference.xml</span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.vty-reference.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.common.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc</span><br><span>diff --git a/OsmoMGW/Makefile b/OsmoMGW/Makefile</span><br><span>index b092e66..96b436b 100644</span><br><span>--- a/OsmoMGW/Makefile</span><br><span>+++ b/OsmoMGW/Makefile</span><br><span>@@ -1,10 +1,10 @@</span><br><span style="color: hsl(0, 100%, 40%);">-TOPDIR = ..</span><br><span style="color: hsl(120, 100%, 40%);">+OSMO_GSM_MANUALS_DIR = ..</span><br><span> </span><br><span> ASCIIDOC = osmomgw-usermanual.adoc</span><br><span> ASCIIDOC_DEPS = chapters/*.adoc</span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.asciidoc.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc</span><br><span> </span><br><span> VTY_REFERENCE = osmomgw-vty-reference.xml</span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.vty-reference.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.common.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc</span><br><span>diff --git a/OsmoMSC/Makefile b/OsmoMSC/Makefile</span><br><span>index c9edcef..2548852 100644</span><br><span>--- a/OsmoMSC/Makefile</span><br><span>+++ b/OsmoMSC/Makefile</span><br><span>@@ -1,10 +1,10 @@</span><br><span style="color: hsl(0, 100%, 40%);">-TOPDIR = ..</span><br><span style="color: hsl(120, 100%, 40%);">+OSMO_GSM_MANUALS_DIR = ..</span><br><span> </span><br><span> ASCIIDOC = osmomsc-usermanual.adoc</span><br><span> ASCIIDOC_DEPS = chapters/*.adoc</span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.asciidoc.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc</span><br><span> </span><br><span> VTY_REFERENCE = osmomsc-vty-reference.xml</span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.vty-reference.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.common.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc</span><br><span>diff --git a/OsmoNAT/Makefile b/OsmoNAT/Makefile</span><br><span>index fde7132..8d7c4a5 100644</span><br><span>--- a/OsmoNAT/Makefile</span><br><span>+++ b/OsmoNAT/Makefile</span><br><span>@@ -1,6 +1,6 @@</span><br><span style="color: hsl(0, 100%, 40%);">-TOPDIR = ..</span><br><span style="color: hsl(120, 100%, 40%);">+OSMO_GSM_MANUALS_DIR = ..</span><br><span> </span><br><span> VTY_REFERENCE = osmonat-vty-reference.xml</span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.vty-reference.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.common.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc</span><br><span>diff --git a/OsmoNITB/Makefile b/OsmoNITB/Makefile</span><br><span>index 0cd260d..4b275dd 100644</span><br><span>--- a/OsmoNITB/Makefile</span><br><span>+++ b/OsmoNITB/Makefile</span><br><span>@@ -1,10 +1,10 @@</span><br><span style="color: hsl(0, 100%, 40%);">-TOPDIR = ..</span><br><span style="color: hsl(120, 100%, 40%);">+OSMO_GSM_MANUALS_DIR = ..</span><br><span> </span><br><span> ASCIIDOC = osmonitb-usermanual.adoc</span><br><span> ASCIIDOC_DEPS = chapters/*.adoc</span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.asciidoc.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc</span><br><span> </span><br><span> VTY_REFERENCE = osmonitb-vty-reference.xml</span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.vty-reference.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.common.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc</span><br><span>diff --git a/OsmoPCU/Makefile b/OsmoPCU/Makefile</span><br><span>index 7a1acc0..0f0ae76 100644</span><br><span>--- a/OsmoPCU/Makefile</span><br><span>+++ b/OsmoPCU/Makefile</span><br><span>@@ -1,11 +1,11 @@</span><br><span style="color: hsl(0, 100%, 40%);">-TOPDIR = ..</span><br><span style="color: hsl(120, 100%, 40%);">+OSMO_GSM_MANUALS_DIR = ..</span><br><span> </span><br><span> ASCIIDOC = osmopcu-usermanual.adoc osmopcu-gb.adoc</span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.asciidoc.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc</span><br><span> osmopcu-gb.pdf: gb/*.adoc gb/*.msc</span><br><span> osmopcu-usermanual.pdf: chapters/*.adoc</span><br><span> </span><br><span> VTY_REFERENCE = osmopcu-vty-reference.xml</span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.vty-reference.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.common.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc</span><br><span>diff --git a/OsmoSGSN/Makefile b/OsmoSGSN/Makefile</span><br><span>index baa1a49..ce69960 100644</span><br><span>--- a/OsmoSGSN/Makefile</span><br><span>+++ b/OsmoSGSN/Makefile</span><br><span>@@ -1,10 +1,10 @@</span><br><span style="color: hsl(0, 100%, 40%);">-TOPDIR = ..</span><br><span style="color: hsl(120, 100%, 40%);">+OSMO_GSM_MANUALS_DIR = ..</span><br><span> </span><br><span> ASCIIDOC = osmosgsn-usermanual.adoc</span><br><span> ASCIIDOC_DEPS = chapters/*.adoc</span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.asciidoc.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc</span><br><span> </span><br><span> VTY_REFERENCE = osmosgsn-vty-reference.xml</span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.vty-reference.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.common.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc</span><br><span>diff --git a/OsmoSIPConnector/Makefile b/OsmoSIPConnector/Makefile</span><br><span>index cd3bb89..e275e41 100644</span><br><span>--- a/OsmoSIPConnector/Makefile</span><br><span>+++ b/OsmoSIPConnector/Makefile</span><br><span>@@ -1,10 +1,10 @@</span><br><span style="color: hsl(0, 100%, 40%);">-TOPDIR = ..</span><br><span style="color: hsl(120, 100%, 40%);">+OSMO_GSM_MANUALS_DIR = ..</span><br><span> </span><br><span> ASCIIDOC = osmosipconnector-usermanual.adoc</span><br><span> ASCIIDOC_DEPS = chapters/*.adoc</span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.asciidoc.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc</span><br><span> </span><br><span> VTY_REFERENCE = osmosipconnector-vty-reference.xml</span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.vty-reference.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.common.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc</span><br><span>diff --git a/OsmoSTP/Makefile b/OsmoSTP/Makefile</span><br><span>index 6832dd4..10149bf 100644</span><br><span>--- a/OsmoSTP/Makefile</span><br><span>+++ b/OsmoSTP/Makefile</span><br><span>@@ -1,11 +1,11 @@</span><br><span style="color: hsl(0, 100%, 40%);">-TOPDIR = ..</span><br><span style="color: hsl(120, 100%, 40%);">+OSMO_GSM_MANUALS_DIR = ..</span><br><span> </span><br><span> ASCIIDOC = osmostp-usermanual.adoc</span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.asciidoc.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc</span><br><span> osmostp-usermanual.pdf: chapters/*.adoc</span><br><span> aoip-mgw-options.pdf: aoip-mgw-options.adoc mgw/*.msc</span><br><span> </span><br><span> VTY_REFERENCE = osmostp-vty-reference.xml</span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.vty-reference.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.common.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc</span><br><span>diff --git a/OsmoTRX/Makefile b/OsmoTRX/Makefile</span><br><span>index 81aec9a..3b4b8b1 100644</span><br><span>--- a/OsmoTRX/Makefile</span><br><span>+++ b/OsmoTRX/Makefile</span><br><span>@@ -1,10 +1,10 @@</span><br><span style="color: hsl(0, 100%, 40%);">-TOPDIR = ..</span><br><span style="color: hsl(120, 100%, 40%);">+OSMO_GSM_MANUALS_DIR = ..</span><br><span> </span><br><span> ASCIIDOC = osmotrx-usermanual.adoc</span><br><span> ASCIIDOC_DEPS = chapters/*.adoc</span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.asciidoc.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc</span><br><span> </span><br><span> VTY_REFERENCE = osmotrx-vty-reference.xml</span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.vty-reference.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.common.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc</span><br><span>diff --git a/OsmocomBB/Makefile b/OsmocomBB/Makefile</span><br><span>index 9f861a5..a0b7a2a 100644</span><br><span>--- a/OsmocomBB/Makefile</span><br><span>+++ b/OsmocomBB/Makefile</span><br><span>@@ -1,7 +1,7 @@</span><br><span style="color: hsl(0, 100%, 40%);">-TOPDIR = ..</span><br><span style="color: hsl(120, 100%, 40%);">+OSMO_GSM_MANUALS_DIR = ..</span><br><span> </span><br><span> ASCIIDOC = osmocombb-usermanual.adoc</span><br><span> ASCIIDOC_DEPS = chapters/*.adoc</span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.asciidoc.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.common.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc</span><br><span>diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc</span><br><span>index c2b0961..2cd7d50 100644</span><br><span>--- a/build/Makefile.asciidoc.inc</span><br><span>+++ b/build/Makefile.asciidoc.inc</span><br><span>@@ -1,6 +1,6 @@</span><br><span> # USAGE:</span><br><span> #</span><br><span style="color: hsl(0, 100%, 40%);">-# - define 'TOPDIR' to point at the git root,</span><br><span style="color: hsl(120, 100%, 40%);">+# - define 'OSMO_GSM_MANUALS_DIR' to point at the git root,</span><br><span> # - define in 'ASCIIDOC' all root .adoc files,</span><br><span> # - optionally define in 'ASCIIDOC_DEPS' all dependencies common to all .adocs,</span><br><span> # - include this file,</span><br><span>@@ -8,16 +8,16 @@</span><br><span> #</span><br><span> # e.g.</span><br><span> #</span><br><span style="color: hsl(0, 100%, 40%);">-# TOPDIR = ..</span><br><span style="color: hsl(120, 100%, 40%);">+# OSMO_GSM_MANUALS_DIR = ..</span><br><span> # ASCIIDOC = osmo_yada.adoc osmo_moo.adoc</span><br><span> # ASCIIDOC_DEPS = for_all/*.adoc</span><br><span style="color: hsl(0, 100%, 40%);">-# include $(TOPDIR)/build/Makefile.asciidoc.inc</span><br><span style="color: hsl(120, 100%, 40%);">+# include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc</span><br><span> # osmo_yada.pdf: yada/*.adoc yada/*.msc</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-BUILDDIR = $(TOPDIR)/build</span><br><span style="color: hsl(120, 100%, 40%);">+BUILDDIR = $(OSMO_GSM_MANUALS_DIR)/build</span><br><span> </span><br><span> GIT_VERSION := $(shell git describe --abbrev=4 --dirty --always --tags)</span><br><span style="color: hsl(0, 100%, 40%);">-GIT_DATE := $(shell $(TOPDIR)/build/unix-time-to-fmt.py `git log -n 1 "--pretty=%at" ../.`)</span><br><span style="color: hsl(120, 100%, 40%);">+GIT_DATE := $(shell $(OSMO_GSM_MANUALS_DIR)/build/unix-time-to-fmt.py `git log -n 1 "--pretty=%at" ../.`)</span><br><span> </span><br><span> # prepend the document name with the version numbe suffix</span><br><span> #DOCS_VER = $(foreach P, $(ASCIIDOC_NAME), $(P)-v$(shell xmllint --recover --xpath "//revnumber[position()=last()]/text()" $(P)-docinfo.xml 2>/dev/null))</span><br><span>@@ -51,8 +51,8 @@</span><br><span> $(ASCIIDOC_PDF): %.pdf: %.adoc %-docinfo.xml \</span><br><span> $(ASCIIDOC_DEPS) \</span><br><span> $(ASCIIDOCSTYLE) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(TOPDIR)/common/*/*.adoc \</span><br><span style="color: hsl(0, 100%, 40%);">- $(TOPDIR)/common/images/*</span><br><span style="color: hsl(120, 100%, 40%);">+ $(OSMO_GSM_MANUALS_DIR)/common/*/*.adoc \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(OSMO_GSM_MANUALS_DIR)/common/images/*</span><br><span> @test -n "$(BUILD_RELEASE)" && echo -e "\n\n\</span><br><span> NOTE: TO REMOVE DRAFT MODE, YOU NEED TO EDIT build/custom-dblatex.sty\n\</span><br><span> and remove three lines starting with '% \"DRAFT\" on first page'\n" \</span><br><span>@@ -62,7 +62,7 @@</span><br><span> </span><br><span> check: $(ASCIIDOC_CHECKS)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-$(ASCIIDOC_CHECKS): %.check: %.adoc %-docinfo.xml $(ASCIIDOCSTYLE) $(TOPDIR)/common/chapters/*.adoc $(ASCIIDOC_DEPS)</span><br><span style="color: hsl(120, 100%, 40%);">+$(ASCIIDOC_CHECKS): %.check: %.adoc %-docinfo.xml $(ASCIIDOCSTYLE) $(OSMO_GSM_MANUALS_DIR)/common/chapters/*.adoc $(ASCIIDOC_DEPS)</span><br><span> asciidoc -v $(ASCIIDOC_OPTS) $< > $@ 2>&1</span><br><span> # Make absolutely sure that the %.check target is updated.</span><br><span> touch $@</span><br><span>diff --git a/build/Makefile.docbook.inc b/build/Makefile.docbook.inc</span><br><span>index 70dfafa..acf410e 100644</span><br><span>--- a/build/Makefile.docbook.inc</span><br><span>+++ b/build/Makefile.docbook.inc</span><br><span>@@ -1,6 +1,6 @@</span><br><span> # USAGE:</span><br><span> #</span><br><span style="color: hsl(0, 100%, 40%);">-# - define 'TOPDIR' to point at the git root,</span><br><span style="color: hsl(120, 100%, 40%);">+# - define 'OSMO_GSM_MANUALS_DIR' to point at the git root,</span><br><span> # - define in 'DOCBOOKS' all root .xml files,</span><br><span> # - optionally define in 'DOCBOOKS_DEPS' all dependencies common to all .xmls,</span><br><span> # - include this file,</span><br><span>@@ -8,10 +8,10 @@</span><br><span> #</span><br><span> # e.g.</span><br><span> #</span><br><span style="color: hsl(0, 100%, 40%);">-# TOPDIR = ..</span><br><span style="color: hsl(120, 100%, 40%);">+# OSMO_GSM_MANUALS_DIR = ..</span><br><span> # DOCBOOKS = osmo_yada.xml osmo_moo.xml</span><br><span> # ASCIIDOC_DEPS = for_all/*.xml</span><br><span style="color: hsl(0, 100%, 40%);">-# include $(TOPDIR)/build/Makefile.docbook.inc</span><br><span style="color: hsl(120, 100%, 40%);">+# include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.docbook.inc</span><br><span> # osmo_yada.pdf: yada/*.xml</span><br><span> #</span><br><span> # XSL stylesheets downloaded from http://docbook.sourceforge.net/release/xsl/current/html/</span><br><span>diff --git a/build/Makefile.vty-reference.inc b/build/Makefile.vty-reference.inc</span><br><span>index 1528d32..659f26c 100644</span><br><span>--- a/build/Makefile.vty-reference.inc</span><br><span>+++ b/build/Makefile.vty-reference.inc</span><br><span>@@ -8,34 +8,34 @@</span><br><span> # Export from VTY 'show online-help', exactly one file.</span><br><span> #</span><br><span> # In your Makefile,</span><br><span style="color: hsl(0, 100%, 40%);">-# - define 'TOPDIR' to point at the git root,</span><br><span style="color: hsl(120, 100%, 40%);">+# - define 'OSMO_GSM_MANUALS_DIR' to point at the git root,</span><br><span> # - define the (single) name of the vty-reference source in VTY_REFERENCE,</span><br><span> # - include this file.</span><br><span> #</span><br><span> # e.g.</span><br><span> #</span><br><span style="color: hsl(0, 100%, 40%);">-# TOPDIR = ..</span><br><span style="color: hsl(120, 100%, 40%);">+# OSMO_GSM_MANUALS_DIR = ..</span><br><span> # VTY_REFERENCE = osmofoo-vty-reference</span><br><span style="color: hsl(0, 100%, 40%);">-# include $(TOPDIR)/build/Makefile.vty-reference.inc</span><br><span style="color: hsl(120, 100%, 40%);">+# include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc</span><br><span> #</span><br><span> # This uses the Makefile.docbook.inc, you should not mix uses of</span><br><span> # Makefile.vty-reference.inc and Makefile.docbook.inc.</span><br><span> </span><br><span> DOCBOOKS = $(VTY_REFERENCE)</span><br><span> DOCBOOKS_DEPS = generated/docbook_vty.xml</span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.docbook.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.docbook.inc</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-MERGE_DOC = $(shell realpath $(TOPDIR)/merge_doc.xsl)</span><br><span style="color: hsl(120, 100%, 40%);">+MERGE_DOC = $(shell realpath $(OSMO_GSM_MANUALS_DIR)/merge_doc.xsl)</span><br><span> </span><br><span> CLEAN_FILES += generated</span><br><span> </span><br><span> generated/docbook_vty.xml: \</span><br><span> vty/*xml \</span><br><span style="color: hsl(0, 100%, 40%);">- $(TOPDIR)/common/vty_additions.xml \</span><br><span style="color: hsl(0, 100%, 40%);">- $(TOPDIR)/common/chapters/vty.xml \</span><br><span style="color: hsl(0, 100%, 40%);">- $(TOPDIR)/vty_reference.xsl</span><br><span style="color: hsl(0, 100%, 40%);">- $(TOPDIR)/build/vty_reference_combine.sh "$(MERGE_DOC)" \</span><br><span style="color: hsl(0, 100%, 40%);">- $(TOPDIR)/common/vty_additions.xml \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(OSMO_GSM_MANUALS_DIR)/common/vty_additions.xml \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(OSMO_GSM_MANUALS_DIR)/common/chapters/vty.xml \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(OSMO_GSM_MANUALS_DIR)/vty_reference.xsl</span><br><span style="color: hsl(120, 100%, 40%);">+ $(OSMO_GSM_MANUALS_DIR)/build/vty_reference_combine.sh "$(MERGE_DOC)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(OSMO_GSM_MANUALS_DIR)/common/vty_additions.xml \</span><br><span> vty/*additions*.xml</span><br><span style="color: hsl(0, 100%, 40%);">- xsltproc $(TOPDIR)/vty_reference.xsl generated/combined.xml \</span><br><span style="color: hsl(120, 100%, 40%);">+ xsltproc $(OSMO_GSM_MANUALS_DIR)/vty_reference.xsl generated/combined.xml \</span><br><span> > generated/docbook_vty.xml</span><br><span>diff --git a/tests/Makefile b/tests/Makefile</span><br><span>index 0b914e9..5afc8ca 100644</span><br><span>--- a/tests/Makefile</span><br><span>+++ b/tests/Makefile</span><br><span>@@ -1,9 +1,9 @@</span><br><span style="color: hsl(0, 100%, 40%);">-TOPDIR = ..</span><br><span style="color: hsl(120, 100%, 40%);">+OSMO_GSM_MANUALS_DIR = ..</span><br><span> </span><br><span> # Generate adoc file that includes all chapters</span><br><span> ASCIIDOC = test-usermanual.adoc</span><br><span> ASCIIDOC_DEPS =</span><br><span style="color: hsl(0, 100%, 40%);">-$(ASCIIDOC): $(TOPDIR)/common/chapters/*.adoc</span><br><span style="color: hsl(120, 100%, 40%);">+$(ASCIIDOC): $(OSMO_GSM_MANUALS_DIR)/common/chapters/*.adoc</span><br><span> echo ":gfdl-enabled:" > $@</span><br><span> echo ":program-name: Test" >> $@</span><br><span> echo "" >> $@</span><br><span>@@ -11,16 +11,16 @@</span><br><span> echo "====================================" >> $@</span><br><span> echo "Oliver Smith <osmith@sysmocom.de>" >> $@</span><br><span> echo "" >> $@</span><br><span style="color: hsl(0, 100%, 40%);">- for chapter in $(TOPDIR)/common/chapters/*.adoc; do \</span><br><span style="color: hsl(120, 100%, 40%);">+ for chapter in $(OSMO_GSM_MANUALS_DIR)/common/chapters/*.adoc; do \</span><br><span> echo "include::$${chapter}[]" >> $@; \</span><br><span> done;</span><br><span> CLEAN_FILES = $(ASCIIDOC)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.asciidoc.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc</span><br><span> </span><br><span> VTY_REFERENCE = test-vty-reference.xml</span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.vty-reference.inc</span><br><span style="color: hsl(0, 100%, 40%);">-include $(TOPDIR)/build/Makefile.common.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc</span><br><span> </span><br><span> </span><br><span> default: all check</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11796">change 11796</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/11796"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-gsm-manuals </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I2af797546de048a6ab19a5cbc755e5e15575d7ab </div>
<div style="display:none"> Gerrit-Change-Number: 11796 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>