Change in osmo-gsm-manuals[master]: fixup: ensure existence of $(abs_srcdir)

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

laforge gerrit-no-reply at lists.osmocom.org
Mon Feb 10 11:49:56 UTC 2020


laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/17118 )

Change subject: fixup: ensure existence of $(abs_srcdir)
......................................................................

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
---
M build/Makefile.asciidoc.inc
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved



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_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))

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/17118
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: I1db85c9319c79171bbc6de2f4f8d3a9db3b11b57
Gerrit-Change-Number: 17118
Gerrit-PatchSet: 2
Gerrit-Owner: neels <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200210/cafd6ee5/attachment.htm>


More information about the gerrit-log mailing list