rename DISTDIR, make it configurable in the menu

7 files changed, 19 insertions, 7 deletions

diff --git a/mk/build.mk b/mk/build.mk
index 42d75bbcd..0d36923d2 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -143,7 +143,7 @@ ${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config $(wildcard ${TOPDIR}/package/*/M
 .PHONY: all world clean cleantarget cleandir cleantoolchain distclean image_clean
 
 world:
-	mkdir -p $(DISTDIR) $(BUILD_DIR) $(TARGET_DIR) $(FW_DIR) \
+	mkdir -p $(DL_DIR) $(BUILD_DIR) $(TARGET_DIR) $(FW_DIR) \
 		$(PACKAGE_DIR) $(TOOLS_BUILD_DIR) $(STAGING_HOST_DIR)/usr/bin \
 		$(TOOLCHAIN_BUILD_DIR) $(STAGING_PKG_DIR)/stamps
 	${BASH} ${TOPDIR}/scripts/scan-pkgs.sh
diff --git a/mk/fetch.mk b/mk/fetch.mk
index a2590d467..6382571b3 100644
--- a/mk/fetch.mk
+++ b/mk/fetch.mk
@@ -2,9 +2,9 @@
 # material, please see the LICENCE file in the top-level directory.
 
 ifneq ($(strip ${DIST_SUBDIR}),)
-FULLDISTDIR?=		${DISTDIR}/${DIST_SUBDIR}
+FULLDISTDIR?=		${DL_DIR}/${DIST_SUBDIR}
 else
-FULLDISTDIR?=		${DISTDIR}
+FULLDISTDIR?=		${DL_DIR}
 endif
 
 FULLDISTFILES=		$(patsubst %,${FULLDISTDIR}/%,${DISTFILES})
diff --git a/mk/vars.mk b/mk/vars.mk
index c497feb9a..904735aab 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -12,7 +12,11 @@ BUILD_GROUP=		$(shell id -gn)
 
 # some global dirs
 BASE_DIR:=		$(TOPDIR)
-DISTDIR?=		${BASE_DIR}/dl
+ifeq ($(ADK_DL_DIR),)
+DL_DIR?=		$(BASE_DIR)/dl
+else
+DL_DIR?=		$(ADK_DL_DIR)
+endif
 TOOLS_BUILD_DIR=	$(BASE_DIR)/tools_build
 SCRIPT_DIR:=		$(BASE_DIR)/scripts
 STAGING_HOST_DIR:=	${BASE_DIR}/host_${GNU_HOST_NAME}
diff --git a/package/ecj/Makefile b/package/ecj/Makefile
index 92898307b..8e4dc6f94 100644
--- a/package/ecj/Makefile
+++ b/package/ecj/Makefile
@@ -24,7 +24,7 @@ ecj-hostinstall:
 	$(STAGING_HOST_DIR)/usr/bin/gcj -lgcj -O2 -findirect-dispatch \
 		-o ${STAGING_HOST_DIR}/usr/bin/ecj.native \
 		--main=org.eclipse.jdt.internal.compiler.batch.Main \
-		$(DISTDIR)/ecj.jar
+		$(DL_DIR)/ecj.jar
 	echo "env LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 ${STAGING_HOST_DIR}/usr/bin/ecj.native \$$@" > \
 		${STAGING_HOST_DIR}/usr/bin/ecj
 	chmod u+x ${STAGING_HOST_DIR}/usr/bin/ecj
diff --git a/package/gcj/Makefile b/package/gcj/Makefile
index 5ff8cc810..15c56b204 100644
--- a/package/gcj/Makefile
+++ b/package/gcj/Makefile
@@ -41,8 +41,8 @@ HOST_CONFIGURE_ARGS:=	--enable-dependency-tracking \
 			--disable-bootstrap
 
 post-extract:
-	(cd $(DISTDIR); wget -O ecj.jar ftp://sourceware.org/pub/java/ecj-4.9.jar)
-	(cd $(WRKBUILD); $(CP) $(DISTDIR)/ecj.jar .)
+	(cd $(DL_DIR); wget -O ecj.jar ftp://sourceware.org/pub/java/ecj-4.9.jar)
+	(cd $(WRKBUILD); $(CP) $(DL_DIR)/ecj.jar .)
 
 include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/rules.mk b/rules.mk
index 8e9e013d9..2fe8aa751 100644
--- a/rules.mk
+++ b/rules.mk
@@ -48,6 +48,7 @@ ADK_RUNTIME_TMPFS_SIZE:=	$(strip $(subst ",, $(ADK_RUNTIME_TMPFS_SIZE)))
 ADK_RUNTIME_CONSOLE_SERIAL_SPEED:=	$(strip $(subst ",, $(ADK_RUNTIME_CONSOLE_SERIAL_SPEED)))
 ADK_HOST:=		$(strip $(subst ",, $(ADK_HOST)))
 ADK_VENDOR:=		$(strip $(subst ",, $(ADK_VENDOR)))
+ADK_DL_DIR:=		$(strip $(subst ",, $(ADK_DL_DIR)))
 ADK_COMPRESSION_TOOL:=		$(strip $(subst ",, $(ADK_COMPRESSION_TOOL)))
 ADK_TOOLS_ADDPATTERN_ARGS:=	$(strip $(subst ",, $(ADK_TOOLS_ADDPATTERN_ARGS)))
 ADK_KERNEL_VERSION:=		$(strip $(subst ",, $(ADK_KERNEL_VERSION)))
diff --git a/target/config/Config.in.adk b/target/config/Config.in.adk
index 46de14044..7544723bf 100644
--- a/target/config/Config.in.adk
+++ b/target/config/Config.in.adk
@@ -12,6 +12,13 @@ config ADK_HOST
 	help
 	  Configure host for IPKG package management.
 
+config ADK_DL_DIR
+	string "download directory for packages"
+	default ""
+	help
+	  Configure the download directory for all source packages.
+	  Use an absolute path.
+
 config ADK_DEBUG
 	bool "Compile applications with debug support by default"
 	default n