From b669d080dbcf9212cd61e99f2fc427764af8b315 Mon Sep 17 00:00:00 2001
From: "Paul A. Patience" <paul-a.patience@polymtl.ca>
Date: Tue, 8 Dec 2015 11:09:30 -0500
Subject: [PATCH] Top-level Makefiles: Check if
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH is enabled

---
 Makefile.unix | 8 ++++++--
 Makefile.win  | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Makefile.unix b/Makefile.unix
index 7d02fed717..28d0df608d 100644
--- a/Makefile.unix
+++ b/Makefile.unix
@@ -72,9 +72,13 @@ ARCH_SRC = $(ARCH_DIR)/src
 ARCH_INC = $(ARCH_DIR)/include
 
 ifeq ($(CONFIG_ARCH_BOARD_CUSTOM),y)
-  BOARD_DIR = $(CONFIG_ARCH_BOARD_CUSTOM_DIR)
+ifeq ($(CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH),y)
+BOARD_DIR = $(TOPDIR)$(DELIM)$(CONFIG_ARCH_BOARD_CUSTOM_DIR)
 else
-  BOARD_DIR = $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)
+BOARD_DIR = $(CONFIG_ARCH_BOARD_CUSTOM_DIR)
+endif
+else
+BOARD_DIR = $(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)
 endif
 
 # CONFIG_APPS_DIR can be over-ridden from the command line or in the .config file.
diff --git a/Makefile.win b/Makefile.win
index 4db50470a9..4988b43ab0 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -65,9 +65,13 @@ ARCH_SRC = $(ARCH_DIR)\src
 ARCH_INC = $(ARCH_DIR)\include
 
 ifeq ($(CONFIG_ARCH_BOARD_CUSTOM),y)
-  BOARD_DIR = $(CONFIG_ARCH_BOARD_CUSTOM_DIR)
+ifeq ($(CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH),y)
+BOARD_DIR = $(TOPDIR)$(DELIM)$(CONFIG_ARCH_BOARD_CUSTOM_DIR)
 else
-  BOARD_DIR = $(TOPDIR)${DELIM}configs$(DELIM)$(CONFIG_ARCH_BOARD)
+BOARD_DIR = $(CONFIG_ARCH_BOARD_CUSTOM_DIR)
+endif
+else
+BOARD_DIR = $(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)
 endif
 
 # CONFIG_APPS_DIR can be over-ridden from the command line or in the .config file.