aboutsummaryrefslogtreecommitdiff
path: root/ct-ng.in
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2018-11-03 14:19:33 -0700
committerAlexey Neyman <stilor@att.net>2018-11-03 14:20:45 -0700
commitd4aa8d954d5f802c75ffaadd3fb938055d62cf25 (patch)
treec69b2ca17032e4327242b09ae1180ae9631a285d /ct-ng.in
parenta98584c8971c1932ddd216fe6bbca456cd94a388 (diff)
downloadcrosstool-ng-d4aa8d954d5f802c75ffaadd3fb938055d62cf25.tar.gz
crosstool-ng-d4aa8d954d5f802c75ffaadd3fb938055d62cf25.tar.bz2
crosstool-ng-d4aa8d954d5f802c75ffaadd3fb938055d62cf25.zip
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>
Diffstat (limited to 'ct-ng.in')
-rw-r--r--ct-ng.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/ct-ng.in b/ct-ng.in
index f8dabd70..75f33545 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!