aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar Ulf Samuelsson <ulf.samuelsson@atmel.com>2008-03-30 06:38:46 +0000
committerGravatar Ulf Samuelsson <ulf.samuelsson@atmel.com>2008-03-30 06:38:46 +0000
commitefd8576c2e4639b5c11c3aa2163c755baf58a6a8 (patch)
treee06bf0b70c15b94d65e2e7f298054acf3e6f59db /Makefile
parent82c92e1e1a79be2082cec743a23dd12f09f97d08 (diff)
downloadbuildroot-efd8576c2e4639b5c11c3aa2163c755baf58a6a8.tar.gz
buildroot-efd8576c2e4639b5c11c3aa2163c755baf58a6a8.tar.bz2
Ensure shell environment is handled correctly
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile16
1 files changed, 9 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 8aad878db1..bfa6a2fadf 100644
--- a/Makefile
+++ b/Makefile
@@ -33,14 +33,10 @@ noconfig_targets:=menuconfig config oldconfig randconfig \
# Use shell variables, if defined
-ifneq ($(BUILDROOT_DL_DIR),)
-BR2_DL_DIR:=$(BUILDROOT_DL_DIR)
-endif
-
ifneq ($(BUILDROOT_LOCAL),)
-LOCAL:=$(BUILDROOT_LOCAL)
+BR2_LOCAL:=$(BUILDROOT_LOCAL)
else
-LOCAL:=$(TOPDIR)/local
+BR2_LOCAL:=$(TOPDIR)/local
endif
# $(shell find . -name *_defconfig |sed 's/.*\///')
@@ -51,10 +47,16 @@ ifeq ($(BOARD),)
-include $(TOPDIR).config
else
# if "make" command
--include $(LOCAL)/$(BOARD)/$(BOARD).config
+-include $(BR2_LOCAL)/$(BOARD)/$(BOARD).config
endif
endif
+# Override BR2_DL_DIR if shell variable defined
+ifneq ($(BUILDROOT_DL_DIR),)
+BR2_DL_DIR:=$(BUILDROOT_DL_DIR)
+endif
+LOCAL:=$(BR2_LOCAL)
+
# To put more focus on warnings, be less verbose as default
# Use 'make V=1' to see the full commands
ifdef V