[MERGED] osmo-gsm-manuals[master]: Fix build with default paths

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/.

Max gerrit-no-reply at lists.osmocom.org
Mon Nov 20 09:21:47 UTC 2017


Max has submitted this change and it was merged.

Change subject: Fix build with default paths
......................................................................


Fix build with default paths

If LIBOSMO_DIR is not set explicitly than ~/source/gsm/libosmocore is
used which is base for MERGE_DOC which is used by
vty_reference_combine.sh as it is. If the shell used by
vty_reference_combine.sh does not expand ~ than the build will
fail. Let's be nice and use realpath on MERGE_DOC before giving it to
vty_reference_combine.sh to make sure complete path is used.

Change-Id: I2edf64348502cbe498d9fd27a686c712b044c926
---
M build/Makefile.vty-reference.inc
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Neels Hofmeyr: Looks good to me, approved
  Harald Welte: Looks good to me, but someone else must approve
  Jenkins Builder: Verified



diff --git a/build/Makefile.vty-reference.inc b/build/Makefile.vty-reference.inc
index baf9cf5..6607ae5 100644
--- a/build/Makefile.vty-reference.inc
+++ b/build/Makefile.vty-reference.inc
@@ -26,7 +26,7 @@
 include $(TOPDIR)/build/Makefile.docbook.inc
 
 LIBOSMO_DIR ?= ~/source/gsm/libosmocore
-MERGE_DOC = $(LIBOSMO_DIR)/doc/vty/merge_doc.xsl
+MERGE_DOC = $(shell realpath $(LIBOSMO_DIR)/doc/vty/merge_doc.xsl)
 
 CLEAN_FILES += generated
 

-- 
To view, visit https://gerrit.osmocom.org/4646
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2edf64348502cbe498d9fd27a686c712b044c926
Gerrit-PatchSet: 3
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>



More information about the gerrit-log mailing list