<p>pespin <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/14838">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, but someone else must approve
  osmith: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Makefile.asciidoc.inc: Export commondir attribute to asciidoc files<br><br>Otherwise, adoc files in osmo-*/doc/manuals/chapters/*.adoc cannot<br>include files from osmo-gsm-manuals/common/chapters/*.adoc, since<br>symbolic link to common/ is only available in builddir, but not in<br>srcdir.<br><br>This way, those files can include commons files like this:<br>include::{commondir}/chapters/foobar.adoc<br><br>Change-Id: Ifc2fdaf1a87d0715213b4eab13c6c9a4f8a987fd<br>---<br>M build/Makefile.asciidoc.inc<br>1 file changed, 5 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc</span><br><span>index fb44a63..1bed968 100644</span><br><span>--- a/build/Makefile.asciidoc.inc</span><br><span>+++ b/build/Makefile.asciidoc.inc</span><br><span>@@ -17,6 +17,7 @@</span><br><span> #     osmo_yada.pdf: yada/*.adoc yada/*.msc</span><br><span> </span><br><span> BUILDDIR = $(OSMO_GSM_MANUALS_DIR)/build</span><br><span style="color: hsl(120, 100%, 40%);">+COMMONDIR = $(OSMO_GSM_MANUALS_DIR)/common</span><br><span> </span><br><span> GIT_VERSION := $(shell git describe --abbrev=4 --dirty --always --tags)</span><br><span> GIT_DATE := $(shell $(OSMO_GSM_MANUALS_DIR)/build/unix-time-to-fmt.py `git log -n 1 "--pretty=%at" ../.`)</span><br><span>@@ -36,7 +37,7 @@</span><br><span> CLEAN_FILES += $(ASCIIDOC_PDF) $(ASCIIDOC_NAME:%=%.html)</span><br><span> UPLOAD_FILES += $(ASCIIDOC_PDF)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ASCIIDOC_OPTS := -f $(BUILDDIR)/mscgen-filter.conf -f $(BUILDDIR)/diag-filter.conf -f $(BUILDDIR)/docinfo-releaseinfo.conf -f $(BUILDDIR)/python2-filter.conf -a srcdir='$(srcdir)'</span><br><span style="color: hsl(120, 100%, 40%);">+ASCIIDOC_OPTS := -f $(BUILDDIR)/mscgen-filter.conf -f $(BUILDDIR)/diag-filter.conf -f $(BUILDDIR)/docinfo-releaseinfo.conf -f $(BUILDDIR)/python2-filter.conf -a srcdir='$(srcdir)' -a commondir='$(COMMONDIR)'</span><br><span> DBLATEX_OPTS := -s $(ASCIIDOCSTYLE) -P draft.mode=yes -P draft.watermark=0</span><br><span> </span><br><span> ifeq (,$(BUILD_RELEASE))</span><br><span>@@ -53,8 +54,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%);">-              $(OSMO_GSM_MANUALS_DIR)/common/*/*.adoc \</span><br><span style="color: hsl(0, 100%, 40%);">-               $(OSMO_GSM_MANUALS_DIR)/common/images/* \</span><br><span style="color: hsl(120, 100%, 40%);">+             $(COMMONDIR)/*/*.adoc \</span><br><span style="color: hsl(120, 100%, 40%);">+               $(COMMONDIR)/images/* \</span><br><span>              build common</span><br><span> </span><br><span>     # a2x can't use a different output file. To support out-of-tree builds,</span><br><span>@@ -79,7 +80,7 @@</span><br><span> </span><br><span> $(ASCIIDOC_CHECKS): %.check: %.adoc %-docinfo.xml \</span><br><span>           $(ASCIIDOCSTYLE) \</span><br><span style="color: hsl(0, 100%, 40%);">-              $(OSMO_GSM_MANUALS_DIR)/common/chapters/*.adoc \</span><br><span style="color: hsl(120, 100%, 40%);">+              $(COMMONDIR)/chapters/*.adoc \</span><br><span>               $(ASCIIDOC_DEPS) \</span><br><span>           build common</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/14838">change 14838</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/c/osmo-gsm-manuals/+/14838"/><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-Change-Id: Ifc2fdaf1a87d0715213b4eab13c6c9a4f8a987fd </div>
<div style="display:none"> Gerrit-Change-Number: 14838 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>