diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-08 12:11:58 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-08 12:11:58 +0100 |
| commit | 8763676774c6f36f2ec69ec2ff2bbc411fa0e6d0 (patch) | |
| tree | 9ffb19323855d0e33c4e4980919ef62eaef21464 /mk | |
| parent | a1b573dff0e1924961f3caf823a5fc1de998f643 (diff) | |
rename DISTDIR, make it configurable in the menu
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 2 | ||||
| -rw-r--r-- | mk/fetch.mk | 4 | ||||
| -rw-r--r-- | mk/vars.mk | 6 |
3 files changed, 8 insertions, 4 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} |