From 5625fcf76fcbb98164410177e8c8e38ec04eac8b Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 2 Nov 2017 13:09:18 +0100 Subject: [PATCH] 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 --- build/Makefile.vty-reference.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@ DOCBOOKS_DEPS = generated/docbook_vty.xml 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