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 <stilor@att.net>
This commit is contained in:
Alexey Neyman 2018-11-03 14:19:33 -07:00
parent a98584c897
commit d4aa8d954d

View File

@ -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!