Browse Source

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 <charlebm@gmail.com>
sbg
Mark Charlebois 10 years ago
parent
commit
84bf4bb6bb
  1. 3
      makefiles/firmware.mk

3
makefiles/firmware.mk

@ -101,7 +101,7 @@ @@ -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 @@ -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

Loading…
Cancel
Save