From 55032c87b2a7135819a20257b3b78c63a525a26b Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Sun, 9 Oct 2016 23:12:10 -0700 Subject: [PATCH] build(fix): use MAKEFILE_LIST to grab the directory where Makefile.defs is in --- Makefile.defs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.defs b/Makefile.defs index 15409219b..8bc69db27 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -9,7 +9,9 @@ endif UNAME:=$(shell uname -s) -TOOLCHAIN_DIR=$(CURDIR)/toolchain +# use MAKEFILE_DIR instead of CURDIR for variables that are exported through -include +MAKEFILE_DIR=$(dir $(abspath $(lastword $(MAKEFILE_LIST)))) +TOOLCHAIN_DIR=$(MAKEFILE_DIR)toolchain POCKETBOOK_TOOLCHAIN=$(TOOLCHAIN_DIR)/pocketbook-toolchain ANDROID_TOOLCHAIN=$(TOOLCHAIN_DIR)/android-toolchain NDKABI=9