From db9b39708d3c0795e0610986a1a889b773e6fce2 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Mon, 10 Feb 2020 12:22:48 +0100 Subject: fixup: ensure existence of $(abs_srcdir) Use $(abs_srcdir) if present, or use `realpath $(srcdir)` otherwise. Previous commit introduced using $(abs_srcdir) instead of $(srcdir), but in setups with static makefiles (osmo-nitb and osmocom-bb), there is no $(abs_srcdir) set, which in effect broke their manuals build. Change-Id: I1db85c9319c79171bbc6de2f4f8d3a9db3b11b57 --- build/Makefile.asciidoc.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc index 63c2bea..1b7375e 100644 --- a/build/Makefile.asciidoc.inc +++ b/build/Makefile.asciidoc.inc @@ -37,7 +37,8 @@ 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 -a srcdir='$(abs_srcdir)' -a commondir='$(COMMONDIR)' +ABS_SRCDIR := $(or $(abs_srcdir),$(shell realpath $(srcdir))) +ASCIIDOC_OPTS := -f $(BUILDDIR)/mscgen-filter.conf -f $(BUILDDIR)/diag-filter.conf -f $(BUILDDIR)/docinfo-releaseinfo.conf -a srcdir='$(ABS_SRCDIR)' -a commondir='$(COMMONDIR)' DBLATEX_OPTS := -s $(ASCIIDOCSTYLE) -P draft.mode=yes -P draft.watermark=0 ifeq (,$(BUILD_RELEASE)) -- cgit v1.2.3