summaryrefslogtreecommitdiffstats
path: root/package/pkg-download.mk
diff options
context:
space:
mode:
authorArnout Vandecappelle <arnout@mind.be>2014-02-04 16:18:51 +0100
committerPeter Korsgaard <peter@korsgaard.com>2014-02-09 11:02:42 +0100
commit6768021c930fe5f7753f274436506792f87ce4da (patch)
tree67ceb57f888c5432b4f5dfd7a9f84c5e6f80f02c /package/pkg-download.mk
parent674fd4f83464a1449a0db8bb4e2584b7b6f6a051 (diff)
downloadbuildroot-6768021c930fe5f7753f274436506792f87ce4da.tar.gz
buildroot-6768021c930fe5f7753f274436506792f87ce4da.zip
infra: replace BUILDROOT_DL_DIR with BR2_DL_DIR.
To make the naming consistent (all user-visible options should be prefixed BR2_). An entry is added to Makefile.legacy to warn users who have set BUILDROOT_DL_DIR but not BR2_DL_DIR. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/pkg-download.mk')
-rw-r--r--package/pkg-download.mk9
1 files changed, 2 insertions, 7 deletions
diff --git a/package/pkg-download.mk b/package/pkg-download.mk
index 2641d4e8b7..84598d5257 100644
--- a/package/pkg-download.mk
+++ b/package/pkg-download.mk
@@ -23,13 +23,8 @@ LOCALFILES := $(call qstrip,$(BR2_LOCALFILES))
# external-deps target.
DL_MODE=DOWNLOAD
-# Override BR2_DL_DIR if shell variable defined
-ifneq ($(BUILDROOT_DL_DIR),)
-DL_DIR := $(BUILDROOT_DL_DIR)
-else
-DL_DIR := $(call qstrip,$(BR2_DL_DIR))
-endif
-
+# DL_DIR may have been set already from the environment
+DL_DIR ?= $(call qstrip,$(BR2_DL_DIR))
ifeq ($(DL_DIR),)
DL_DIR := $(TOPDIR)/dl
endif
OpenPOWER on IntegriCloud