From 44d3f78b9c77fe2872e4d10feba39e3e6afbbbb8 Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-ng.org>
Date: Sun, 14 Oct 2018 00:29:47 +0100
Subject: [PATCH] Adjust the Cooja build system to the new build output dir
 structure

---
 arch/platform/cooja/Makefile.cooja             | 8 ++++----
 arch/platform/cooja/Makefile.customrules-cooja | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/platform/cooja/Makefile.cooja b/arch/platform/cooja/Makefile.cooja
index d06aa08d5..6a6a9d49e 100644
--- a/arch/platform/cooja/Makefile.cooja
+++ b/arch/platform/cooja/Makefile.cooja
@@ -34,10 +34,10 @@ endif
 
 endif ## QUICKSTART
 
-#MAIN_SRC = $(OBJECTDIR)/$(LIBNAME).c
-MAIN_OBJ = $(OBJECTDIR)/$(LIBNAME).o
-ARCHIVE = $(OBJECTDIR)/$(LIBNAME).a
-JNILIB = $(OBJECTDIR)/$(LIBNAME).$(TARGET)
+#MAIN_SRC = $(BUILD_DIR_BOARD)/$(LIBNAME).c
+MAIN_OBJ = $(BUILD_DIR_BOARD)/$(LIBNAME).o
+ARCHIVE = $(BUILD_DIR_BOARD)/$(LIBNAME).a
+JNILIB = $(BUILD_DIR_BOARD)/$(LIBNAME).$(TARGET)
 CONTIKI_APP_OBJ = $(CONTIKI_APP).o
 
 ### COOJA platform sources
diff --git a/arch/platform/cooja/Makefile.customrules-cooja b/arch/platform/cooja/Makefile.customrules-cooja
index 42d6e125e..60d6240f1 100644
--- a/arch/platform/cooja/Makefile.customrules-cooja
+++ b/arch/platform/cooja/Makefile.customrules-cooja
@@ -10,11 +10,11 @@ CUSTOM_RULE_LINK=1
 
 REDEF_PRINTF=1 # Redefine functions to enable printf()s inside Cooja
 
-# NB: Assumes ARCHIVE was not overridden and is in $(OBJECTDIR)
+# NB: Assumes ARCHIVE was not overridden and is in $(BUILD_DIR_BOARD)
 $(ARCHIVE): $(CONTIKI_OBJECTFILES) | $(OBJECTDIR)
 	$(AR_COMMAND_1) $^ $(AR_COMMAND_2)
 
-# NB: Assumes JNILIB was not overridden and is in $(OBJECTDIR)
+# NB: Assumes JNILIB was not overridden and is in $(BUILD_DIR_BOARD)
 $(JNILIB): $(CONTIKI_APP_OBJ) $(MAIN_OBJ) $(PROJECT_OBJECTFILES) $(ARCHIVE) | $(OBJECTDIR)
 
 ifdef REDEF_PRINTF