From a1b0651a5a43a21355683f7e3461f654d9334f23 Mon Sep 17 00:00:00 2001
From: Ulf Samuelsson
Date: Fri, 28 Mar 2008 07:31:28 +0000
Subject: Use BUSYBOX_LOCAL shell variable, if defined

---
 Makefile | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 9f9f0628d..5a74f8a1f 100644
--- a/Makefile
+++ b/Makefile
@@ -31,23 +31,28 @@ noconfig_targets:=menuconfig config oldconfig randconfig \
 	defconfig allyesconfig allnoconfig release tags \
 	source-check help
 
-# $(shell find . -name *_defconfig |sed 's/.*\///')
 
-# Pull in the user's configuration file
-ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
-ifeq ($(BOARD),)
--include $(TOPDIR).config
-else
--include $(TOPDIR)/local/$(BOARD)/$(BOARD).config
-endif
-endif
+# Use shell variables, if defined
 ifneq ($(BUILDROOT_DL_DIR),)
 BR2_DL_DIR:=$(BUILDROOT_DL_DIR)
 endif
+
 ifneq ($(BUILDROOT_LOCAL),)
 LOCAL:=$(BUILDROOT_LOCAL)
 else
-LOCAL:=local
+LOCAL:=$(TOPDIR)/local
+endif
+
+# $(shell find . -name *_defconfig |sed 's/.*\///')
+# Pull in the user's configuration file
+ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
+ifeq ($(BOARD),)
+# if "make BOARD=xyz" command
+-include $(TOPDIR).config
+else
+# if "make" command
+-include $(LOCAL)/$(BOARD)/$(BOARD).config
+endif
 endif
 
 # To put more focus on warnings, be less verbose as default
-- 
cgit v1.2.3-55-g7522