From 76c76a19773b15a977d0d6917be65b7fa52e4a09 Mon Sep 17 00:00:00 2001
From: Benjamin Walsh <benjamin.walsh@windriver.com>
Date: Wed, 10 Feb 2016 14:36:39 -0500
Subject: [PATCH] kbuild: support arbitrary dir for Makefile.app

The location of Makefile.app can now be specified via MAKEFILE_APP_DIR
instead of implicitly being searched for in the project directory.

Change-Id: Ib86bf25e210d9c3749c5811b6e36376f59e3cd32
Signed-off-by: Benjamin Walsh <benjamin.walsh@windriver.com>
---
 Makefile | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Makefile b/Makefile
index eea57e3d8f1..b6864ec5216 100644
--- a/Makefile
+++ b/Makefile
@@ -521,8 +521,16 @@ scripts: scripts_basic include/config/auto.conf include/config/tristate.conf
 core-y := lib/ kernel/ misc/ net/ boards/ arch/
 drivers-y := drivers/
 
+ifneq ($(strip $(MAKEFILE_APP_DIR)),)
+MAKEFILE_APP := $(realpath $(MAKEFILE_APP_DIR)/Makefile.app)
+endif
+
 ifneq ($(strip $(PROJECT)),)
+ifneq ($(strip $(MAKEFILE_APP)), )
+include $(MAKEFILE_APP)
+else
 -include $(PROJECT)/Makefile.app
+endif
 ifneq ($(strip $(KBUILD_ZEPHYR_APP)),)
 export KBUILD_ZEPHYR_APP
 endif