summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2019-07-19 16:35:25 +0200
committerPau Espin Pedrol <pespin@sysmocom.de>2019-07-19 16:39:13 +0200
commit66f7bea3177019adb0fc731f5a2d86671b551a59 (patch)
tree6de30e1d4e0fb0165f2bea3d7f38e8c9e8e00f6b
parent523862c2d5989dea1a243e49c6ff356aac459885 (diff)
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
-rw-r--r--build/Makefile.asciidoc.inc9
1 files changed, 5 insertions, 4 deletions
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_NAME:%=%__*.png) $(ASCIIDOC_NAME:%=%__*.svg) $(ASCIIDO
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 @@ all: $(ASCIIDOC_PDF)
$(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 @@ check: $(ASCIIDOC_CHECKS)
$(ASCIIDOC_CHECKS): %.check: %.adoc %-docinfo.xml \
$(ASCIIDOCSTYLE) \
- $(OSMO_GSM_MANUALS_DIR)/common/chapters/*.adoc \
+ $(COMMONDIR)/chapters/*.adoc \
$(ASCIIDOC_DEPS) \
build common