summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2012-09-30 18:18:48 +0200
committerAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2012-09-30 18:18:48 +0200
commit19bc9e3c5a1757605e392592bce533f09024a81b (patch)
tree8718fe7313c2a898dbeb2429bd36030c96e7ecb6 /mk
parentfe5d6382fa8531efd89f9191c21101af14ec5aee (diff)
downloadembtoolkit-19bc9e3c5a1757605e392592bce533f09024a81b.tar.gz
embtoolkit-19bc9e3c5a1757605e392592bce533f09024a81b.tar.bz2
embtoolkit-19bc9e3c5a1757605e392592bce533f09024a81b.tar.xz
Build system: replace usage of DOWNLOAD_DIR with embtk_dldir
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'mk')
-rw-r--r--mk/buildsystem.mk2
-rw-r--r--mk/macros.packages.mk6
2 files changed, 4 insertions, 4 deletions
diff --git a/mk/buildsystem.mk b/mk/buildsystem.mk
index 86692d9..3f19c79 100644
--- a/mk/buildsystem.mk
+++ b/mk/buildsystem.mk
@@ -176,4 +176,4 @@ endef
rmallpath:
$(Q)rm -rf $(PACKAGES_BUILD)* $(ROOTFS)* $(TOOLS)* $(TOOLS_BUILD)*
$(Q)rm -rf $(SYSROOT)* $(HOSTTOOLS)* $(EMBTK_GENERATED)/rootfs-*
- $(Q)$(if $(CONFIG_EMBTK_CACHE_PATCHES),,rm -rf $(DOWNLOAD_DIR)/*.patch)
+ $(Q)$(if $(CONFIG_EMBTK_CACHE_PATCHES),,rm -rf $(embtk_dldir)/*.patch)
diff --git a/mk/macros.packages.mk b/mk/macros.packages.mk
index 9ac7301..593faf6 100644
--- a/mk/macros.packages.mk
+++ b/mk/macros.packages.mk
@@ -27,7 +27,7 @@
# wget wrapper
# usage: $(call embtk_wget,$(OUTPUT_FILE),$(SITE),$(FOREIGN_FILE))
#
-__wget_outfile = $(patsubst %/,%,$(DOWNLOAD_DIR))/$(strip $(1))
+__wget_outfile = $(patsubst %/,%,$(embtk_dldir))/$(strip $(1))
__wget_remotesite = $(patsubst %/,%,$(strip $(2)))
__wget_foreignfiles = $(strip $(3))
__wget_opts = --tries=5 --timeout=10 --waitretry=5
@@ -115,7 +115,7 @@ __embtk_pkg_site = $(strip $($(PKGV)_SITE))
__embtk_patch_site = ftp://ftp.embtoolkit.org/embtoolkit.org
__embtk_patch_url = $(__embtk_patch_site)/$(__embtk_pkg_name)/$(__embtk_pkg_version)
__embtk_pkg_patch_site = $(strip $(or $($(PKGV)_PATCH_SITE),$(__embtk_patch_url)))
-__embtk_pkg_patch_f = $(strip $(DOWNLOAD_DIR))/$(__embtk_pkg_name)-$(__embtk_pkg_version).patch
+__embtk_pkg_patch_f = $(strip $(embtk_dldir))/$(__embtk_pkg_name)-$(__embtk_pkg_version).patch
__embtk_pkg_mirror = $(__embtk_patch_site)/packages-mirror
__embtk_pkg_mirror1 = $(strip $($(PKGV)_MIRROR1))
__embtk_pkg_mirror2 = $(strip $($(PKGV)_MIRROR2))
@@ -140,7 +140,7 @@ __embtk_pkg_localgit = $(strip $(if $(__embtk_pkg_usegit), \
__embtk_pkg_version = $(or $(strip $($(PKGV)_VERSION)),$(__embtk_pkg_usegit),$(__embtk_pkg_usesvn))
-__embtk_pkg_package_f = $(strip $(DOWNLOAD_DIR))/$(__embtk_pkg_package)
+__embtk_pkg_package_f = $(strip $(embtk_dldir))/$(__embtk_pkg_package)
__embtk_pkg_srcdir = $(or $(__embtk_pkg_localgit),$(__embtk_pkg_localsvn),$(patsubst %/,%,$(strip $($(PKGV)_SRC_DIR))))
__embtk_pkg_builddir = $(patsubst %/,%,$(strip $($(PKGV)_BUILD_DIR)))