From e8251d786b12a52b8d9faccbde1bd0de9fe4d0bb Mon Sep 17 00:00:00 2001
From: Richard Weickelt <r-weickelt@ti.com>
Date: Fri, 2 Feb 2018 15:29:35 +0100
Subject: [PATCH] Fix path errors when including arm makefiles from another
 location than a CPU makefile

---
 Makefile.include          | 2 +-
 arch/cpu/arm/Makefile.arm | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Makefile.include b/Makefile.include
index 319ae29d7..c3ce40f49 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -262,7 +262,7 @@ CONTIKI_CPU_DIRS_CONCAT    = ${addprefix $(CONTIKI_CPU)/, \
                                $(CONTIKI_CPU_DIRS)}
 CONTIKI_ARCH_DIRS    = ${addprefix $(CONTIKI)/, arch}
 
-SOURCEDIRS = . $(PROJECTDIRS) $(CONTIKI_TARGET_DIRS_CONCAT) $(CONTIKI_ARCH_DIRS) \
+SOURCEDIRS = $(CONTIKI) $(PROJECTDIRS) $(CONTIKI_TARGET_DIRS_CONCAT) $(CONTIKI_ARCH_DIRS) \
              $(CONTIKI_CPU_DIRS_CONCAT) $(CONTIKIDIRS) $(MODULEDIRS) $(EXTERNALDIRS) ${dir $(target_makefile)}
 
 vpath %.c $(SOURCEDIRS)
diff --git a/arch/cpu/arm/Makefile.arm b/arch/cpu/arm/Makefile.arm
index 0b2662423..0c71d63fa 100644
--- a/arch/cpu/arm/Makefile.arm
+++ b/arch/cpu/arm/Makefile.arm
@@ -1,3 +1,6 @@
+MAKEFILE := $(lastword $(MAKEFILE_LIST))
+BASE_DIR := $(realpath $(dir $(MAKEFILE)))
+
 CC       = arm-none-eabi-gcc
 CPP      = arm-none-eabi-cpp
 LD       = arm-none-eabi-gcc
@@ -27,8 +30,9 @@ else
 endif
 
 ### Use CMSIS and the existing dbg-io from arch/cpu/arm/common
-CONTIKI_ARM_DIRS += . common/dbg-io
-CONTIKI_CPU_DIRS += $(addprefix ../arm/, $(CONTIKI_ARM_DIRS))
+CONTIKI_ARM_DIRS += .
+CONTIKI_ARM_DIRS += ../common/dbg-io
+CONTIKI_CPU_DIRS += $(realpath $(addprefix $(BASE_DIR)/, $(CONTIKI_ARM_DIRS)))
 
 ### CPU-dependent cleanup files
 CLEAN += *.elf *.bin *.lst *.hex *.i16hex