Change in ...osmo-gsm-manuals[master]: Makefile.asciidoc.inc: Export commondir attribute to asciidoc files

pespin gerrit-no-reply at lists.osmocom.org
Fri Jul 19 14:40:57 UTC 2019


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


Change subject: Makefile.asciidoc.inc: Export commondir attribute to asciidoc files
......................................................................

Makefile.asciidoc.inc: Export commondir attribute to asciidoc files

Otherwise, adoc files in osmo-*/doc/manuals/chapters/*.adoc cannot
include files from osmo-gsm-manuals/common/chapters/*.adoc, since
symbolic link to common/ is only available in builddir, but not in
srcdir.

This way, those files can include commons files like this:
include::{commondir}/chapters/foobar.adoc

Change-Id: Ifc2fdaf1a87d0715213b4eab13c6c9a4f8a987fd
---
M build/Makefile.asciidoc.inc
1 file changed, 5 insertions(+), 4 deletions(-)



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

diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc
index fb44a63..1bed968 100644
--- a/build/Makefile.asciidoc.inc
+++ b/build/Makefile.asciidoc.inc
@@ -17,6 +17,7 @@
 #     osmo_yada.pdf: yada/*.adoc yada/*.msc
 
 BUILDDIR = $(OSMO_GSM_MANUALS_DIR)/build
+COMMONDIR = $(OSMO_GSM_MANUALS_DIR)/common
 
 GIT_VERSION := $(shell git describe --abbrev=4 --dirty --always --tags)
 GIT_DATE := $(shell $(OSMO_GSM_MANUALS_DIR)/build/unix-time-to-fmt.py `git log -n 1 "--pretty=%at" ../.`)
@@ -36,7 +37,7 @@
 CLEAN_FILES += $(ASCIIDOC_PDF) $(ASCIIDOC_NAME:%=%.html)
 UPLOAD_FILES += $(ASCIIDOC_PDF)
 
-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)'
+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)'
 DBLATEX_OPTS := -s $(ASCIIDOCSTYLE) -P draft.mode=yes -P draft.watermark=0
 
 ifeq (,$(BUILD_RELEASE))
@@ -53,8 +54,8 @@
 $(ASCIIDOC_PDF): %.pdf: %.adoc %-docinfo.xml \
 		$(ASCIIDOC_DEPS) \
 		$(ASCIIDOCSTYLE) \
-		$(OSMO_GSM_MANUALS_DIR)/common/*/*.adoc \
-		$(OSMO_GSM_MANUALS_DIR)/common/images/* \
+		$(COMMONDIR)/*/*.adoc \
+		$(COMMONDIR)/images/* \
 		build common
 
 	# a2x can't use a different output file. To support out-of-tree builds,
@@ -79,7 +80,7 @@
 
 $(ASCIIDOC_CHECKS): %.check: %.adoc %-docinfo.xml \
 		$(ASCIIDOCSTYLE) \
-		$(OSMO_GSM_MANUALS_DIR)/common/chapters/*.adoc \
+		$(COMMONDIR)/chapters/*.adoc \
 		$(ASCIIDOC_DEPS) \
 		build common
 

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/14838
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: Ifc2fdaf1a87d0715213b4eab13c6c9a4f8a987fd
Gerrit-Change-Number: 14838
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190719/b8dfb19c/attachment-0001.html>


More information about the gerrit-log mailing list