aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax <msuraev@sysmocom.de>2017-11-02 13:09:18 +0100
committerMax <msuraev@sysmocom.de>2017-11-20 09:21:47 +0000
commit5625fcf76fcbb98164410177e8c8e38ec04eac8b (patch)
treea4340129c3e20793f3286a17f3f7259681379972
parent5c6f783d60704d7eb09240fbc51fff0bdb05aa38 (diff)
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
-rw-r--r--build/Makefile.vty-reference.inc2
1 files changed, 1 insertions, 1 deletions
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