aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Ulf Samuelsson <ulf.samuelsson@atmel.com>2007-08-20 15:47:42 +0000
committerGravatar Ulf Samuelsson <ulf.samuelsson@atmel.com>2007-08-20 15:47:42 +0000
commitadbc5a18cb21e6b5203d559ba95dfa45a7f89deb (patch)
tree5946f0d8a738132508dfd46c4417fc258a675674
parentac4e670d345b58ce7f0c871376f789e3f0f5a04a (diff)
downloadbuildroot-adbc5a18cb21e6b5203d559ba95dfa45a7f89deb.tar.gz
buildroot-adbc5a18cb21e6b5203d559ba95dfa45a7f89deb.tar.bz2
Add BUILDROOT_DL_DIR to dependencies.sh and fix whitespace damage (sorry)
-rw-r--r--Makefile2
-rwxr-xr-xtoolchain/dependencies/dependencies.sh8
2 files changed, 8 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index c1df6a3039..44676f1f1a 100644
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,7 @@ noconfig_targets := menuconfig config oldconfig randconfig \
ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
-include $(TOPDIR).config
endif
-ifneq ($(BUILDROOT_DL_DIR),)
+ifneq ($(BUILDROOT_DL_DIR),)
BR2_DL_DIR:=$(BUILDROOT_DL_DIR)
endif
diff --git a/toolchain/dependencies/dependencies.sh b/toolchain/dependencies/dependencies.sh
index d1bccd247a..60b9b65966 100755
--- a/toolchain/dependencies/dependencies.sh
+++ b/toolchain/dependencies/dependencies.sh
@@ -11,6 +11,13 @@ export LC_ALL=C
# check build system 'environment'
#
#############################################################
+if test -n "$BUILDROOT_DL_DIR" ; then
+ /bin/echo -e "Overriding \$(DL_DIR) in '.config'. Ok"
+ /bin/echo -e "External download directory: Ok ($BUILDROOT_DL_DIR)"
+else
+ echo "BUILDROOT_DL_DIR clean: Ok"
+fi
+
if test -n "$CC" ; then
echo "CC clean: FALSE"
/bin/echo -e "\n\nYou must run 'unset CC' so buildroot can run with";
@@ -19,7 +26,6 @@ if test -n "$CC" ; then
fi;
echo "CC clean: Ok"
-
if test -n "$CXX" ; then
echo "CXX clean: FALSE"
/bin/echo -e "\n\nYou must run 'unset CXX' so buildroot can run with";