From 84bf4bb6bbe4f3ba2da7237faab85b8fa4d5ec8d Mon Sep 17 00:00:00 2001 From: Mark Charlebois Date: Tue, 16 Jun 2015 09:54:34 -0700 Subject: [PATCH] Use ?= for MK_DIR in firmware.mk APU requires the use of ?= for MK_DIR but the use of lastword was causing MK_DIR to be a subdir of makefiles. Changed lastword to firstword (which is always the path to firmware.mk) which fixed the problem. Signed-off-by: Mark Charlebois --- makefiles/firmware.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/makefiles/firmware.mk b/makefiles/firmware.mk index 6cdeed5fda..bb310dbff5 100644 --- a/makefiles/firmware.mk +++ b/makefiles/firmware.mk @@ -101,7 +101,7 @@ # If PX4_BASE wasn't set previously, work out what it should be # and set it here now. # -MK_DIR := $(dir $(lastword $(MAKEFILE_LIST))) +MK_DIR ?= $(dir $(firstword $(MAKEFILE_LIST))) ifeq ($(PX4_BASE),) export PX4_BASE := $(abspath $(MK_DIR)/..) endif @@ -111,7 +111,6 @@ $(error Cannot build when the PX4_BASE path contains one or more space character endif $(info % GIT_DESC = $(GIT_DESC)) -$(info % MK_DIR = $(MK_DIR)) # # Set a default target so that included makefiles or errors here don't