From d4aa8d954d5f802c75ffaadd3fb938055d62cf25 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Sat, 3 Nov 2018 14:19:33 -0700 Subject: Fix CT_LIBEXEC_DIR and CT_DOC_DIR if "local" ct-ng is run from other dir Also, no need to use $(shell) if make has the same builtin. Fixes #933. Closes #1081. Signed-off-by: Alexey Neyman diff --git a/ct-ng.in b/ct-ng.in index f8dabd7..75f3354 100644 --- a/ct-ng.in +++ b/ct-ng.in @@ -17,9 +17,9 @@ export CT_TOP_DIR:=$(shell pwd) ifeq (@enable_local@,yes) # automake does not allow to set pkgxxxdir, they are always derived from # a respective xxxdir. So, for enable-local case, set them directly here. -export CT_LIB_DIR:=$(shell dirname $(CT_NG)) -export CT_LIBEXEC_DIR:=$(CT_TOP_DIR)/kconfig -export CT_DOC_DIR:=$(CT_TOP_DIR)/docs +export CT_LIB_DIR:=$(dir $(CT_NG)) +export CT_LIBEXEC_DIR:=$(CT_LIB_DIR)/kconfig +export CT_DOC_DIR:=$(CT_LIB_DIR)/docs else # Paths and values set by ./configure # Don't bother to change it other than with a new ./configure! -- cgit v0.10.2-6-g49f6