- rename $(*_TMP) => $(*_DIR)

5 years ago · 8deee895bf
18 changed files with 662 additions and 662 deletions
--- a/make/crosstool.mk
+++ b/make/crosstool.mk
@ -50,12 +50,12 @@ kernel-tarball: $(BUILD_DIR)/linux-$(KERNEL_VER).tar
 # create kernel-tarball
 $(BUILD_DIR)/linux-$(KERNEL_VER).tar: | $(BUILD_DIR)
 	$(MAKE) kernel.do_prepare.$(if $(filter $(KERNEL_SOURCE),git),git,tar)
-	tar cf $(@) --exclude-vcs -C $(BUILD_DIR)/$(KERNEL_TMP) .
+	tar cf $(@) --exclude-vcs -C $(BUILD_DIR)/$(KERNEL_DIR) .
 # -----------------------------------------------------------------------------
 CROSSTOOL-NG_VER    = git
-CROSSTOOL-NG_TMP    = crosstool-ng.$(CROSSTOOL-NG_VER)
+CROSSTOOL-NG_DIR    = crosstool-ng.$(CROSSTOOL-NG_VER)
 CROSSTOOL-NG_SOURCE = crosstool-ng.$(CROSSTOOL-NG_VER)
 CROSSTOOL-NG_SITE   = https://github.com/neutrino-images
@ -84,19 +84,19 @@ $(CROSS_BASE)/arm/hd2: $(DL_DIR)/$(GCC-LINARO_SOURCE)
 $(CROSS_DIR): | $(BUILD_DIR)
 	make $(BUILD_DIR)/linux-$(KERNEL_VER).tar
 	#
-	$(REMOVE)/$(CROSSTOOL-NG_TMP)
+	$(REMOVE)/$(CROSSTOOL-NG_DIR)
 	$(GET-GIT-SOURCE) $(CROSSTOOL-NG_SITE)/$(CROSSTOOL-NG_SOURCE) $(DL_DIR)/$(CROSSTOOL-NG_SOURCE)
 	$(CPDIR)/$(CROSSTOOL-NG_SOURCE)
 ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd1 hd2))
-	$(CHDIR)/$(CROSSTOOL-NG_TMP); \
+	$(CHDIR)/$(CROSSTOOL-NG_DIR); \
 		git checkout 1dbb06f2; \
 		$(call apply_patches, $(CROSSTOOL-NG_PATCH))
  ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2))
-	$(CHDIR)/$(CROSSTOOL-NG_TMP); \
+	$(CHDIR)/$(CROSSTOOL-NG_DIR); \
 		$(INSTALL_COPY) $(PATCHES)/crosstool-ng/gcc/* patches/gcc/linaro-6.3-2017.02
  endif
 endif
-	$(CHDIR)/$(CROSSTOOL-NG_TMP); \
+	$(CHDIR)/$(CROSSTOOL-NG_DIR); \
 		unset CONFIG_SITE LIBRARY_PATH CPATH C_INCLUDE_PATH PKG_CONFIG_PATH CPLUS_INCLUDE_PATH INCLUDE; \
 		$(INSTALL_DATA) $(CROSSTOOL-NG_CONFIG) .config; \
 		sed -i "s|^CT_PARALLEL_JOBS=.*|CT_PARALLEL_JOBS=$(PARALLEL_JOBS)|" .config; \
@ -117,7 +117,7 @@ ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd1 hd2))
 endif
 	test -e $(CROSS_DIR)/$(TARGET)/lib || ln -sf sys-root/lib $(CROSS_DIR)/$(TARGET)/
 	rm -f $(CROSS_DIR)/$(TARGET)/sys-root/lib/libstdc++.so.6.0.*-gdb.py
-	$(REMOVE)/$(CROSSTOOL-NG_TMP)
+	$(REMOVE)/$(CROSSTOOL-NG_DIR)
 # -----------------------------------------------------------------------------
--- a/make/environment-build.mk
+++ b/make/environment-build.mk
@ -71,10 +71,10 @@ PKG_NAME        = $(basename $(@F))
 PKG_UPPER       = $(call UPPERCASE,$(PKG_NAME))
 PKG_LOWER       = $(call LOWERCASE,$(PKG_NAME))
 PKG_VER         = $($(PKG_UPPER)_VER)
-PKG_TMP         = $($(PKG_UPPER)_TMP)
+PKG_DIR         = $($(PKG_UPPER)_DIR)
 PKG_SOURCE      = $($(PKG_UPPER)_SOURCE)
 PKG_SITE        = $($(PKG_UPPER)_SITE)
-PKG_BUILD_TMP   = $(BUILD_DIR)/$(PKG_TMP)
+PKG_BUILD_DIR   = $(BUILD_DIR)/$(PKG_DIR)
 PKG_PATCHES_DIR = $(PATCHES)/$(subst host-,,$(PKG_NAME))
 # -----------------------------------------------------------------------------
--- a/make/environment-image.mk
+++ b/make/environment-image.mk
@ -63,7 +63,7 @@ endif
 IMAGE_SITE = $(NI-SERVER)/$(NI-SUBDIR)
 IMAGE_MD5FILE = $(IMAGE_TYPE_STRING)-$(IMAGE_SUFFIX).txt
-IMAGE_BUILD_TMP = $(BUILD_DIR)/image-build
+IMAGE_BUILD_DIR = $(BUILD_DIR)/image-build
 ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo))
  IMAGE_SUBDIR = $(subst vu,vuplus/,$(BOXMODEL))
--- a/make/environment-linux.mk
+++ b/make/environment-linux.mk
@ -5,7 +5,7 @@
 ifeq ($(BOXMODEL), nevis)
  KERNEL_VER    = 2.6.34.13
-  KERNEL_TMP    = linux-$(KERNEL_VER)
+  KERNEL_DIR    = linux-$(KERNEL_VER)
  KERNEL_SOURCE = git
  KERNEL_SITE   = $(EMPTY)
@ -14,7 +14,7 @@ ifeq ($(BOXMODEL), nevis)
 else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), apollo shiner kronos kronos_v2))
  KERNEL_VER    = 3.10.93
-  KERNEL_TMP    = linux-$(KERNEL_VER)
+  KERNEL_DIR    = linux-$(KERNEL_VER)
  KERNEL_SOURCE = git
  KERNEL_SITE   = $(EMPTY)
@ -29,7 +29,7 @@ else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), apollo shiner kronos kronos_v2))
 else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd51 bre2ze4k h7))
  KERNEL_VER    = 4.10.12
-  KERNEL_TMP    = linux-$(KERNEL_VER)
+  KERNEL_DIR    = linux-$(KERNEL_VER)
  KERNEL_SOURCE = linux-$(KERNEL_VER)-arm.tar.gz
  KERNEL_SITE   = http://downloads.mutant-digital.net
@ -42,7 +42,7 @@ else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd51 bre2ze4k h7))
 else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd60))
  KERNEL_VER    = 4.4.35
  KERNEL_DATE   = 20200219
-  KERNEL_TMP    = linux-$(KERNEL_VER)
+  KERNEL_DIR    = linux-$(KERNEL_VER)
  KERNEL_SOURCE = linux-$(KERNEL_VER)-$(KERNEL_DATE)-arm.tar.gz
  KERNEL_SITE   = http://source.mynonpublic.com/gfutures
@ -55,7 +55,7 @@ else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd60))
 else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd61))
  KERNEL_VER    = 4.4.35
  KERNEL_DATE   = 20181228
-  KERNEL_TMP    = linux-$(KERNEL_VER)
+  KERNEL_DIR    = linux-$(KERNEL_VER)
  KERNEL_SOURCE = linux-$(KERNEL_VER)-$(KERNEL_DATE)-arm.tar.gz
  KERNEL_SITE   = http://source.mynonpublic.com/gfutures
@ -67,7 +67,7 @@ else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd61))
 else ifeq ($(BOXMODEL), vusolo4k)
  KERNEL_VER    = 3.14.28-1.8
-  KERNEL_TMP    = linux
+  KERNEL_DIR    = linux
  KERNEL_SOURCE = stblinux-3.14-1.8.tar.bz2
  KERNEL_SITE   = http://archive.vuplus.com/download/kernel
@ -83,7 +83,7 @@ else ifeq ($(BOXMODEL), vusolo4k)
 else ifeq ($(BOXMODEL), vuduo4k)
  KERNEL_VER    = 4.1.45-1.17
-  KERNEL_TMP    = linux
+  KERNEL_DIR    = linux
  KERNEL_SOURCE = stblinux-4.1-1.17.tar.bz2
  KERNEL_SITE   = http://archive.vuplus.com/download/kernel
@ -99,7 +99,7 @@ else ifeq ($(BOXMODEL), vuduo4k)
 else ifeq ($(BOXMODEL), vuduo4kse)
  KERNEL_VER    = 4.1.45-1.17
-  KERNEL_TMP    = linux
+  KERNEL_DIR    = linux
  KERNEL_SOURCE = stblinux-4.1-1.17.tar.bz2
  KERNEL_SITE   = http://archive.vuplus.com/download/kernel
@ -115,7 +115,7 @@ else ifeq ($(BOXMODEL), vuduo4kse)
 else ifeq ($(BOXMODEL), vuultimo4k)
  KERNEL_VER    = 3.14.28-1.12
-  KERNEL_TMP    = linux
+  KERNEL_DIR    = linux
  KERNEL_SOURCE = stblinux-3.14-1.12.tar.bz2
  KERNEL_SITE   = http://archive.vuplus.com/download/kernel
@ -131,7 +131,7 @@ else ifeq ($(BOXMODEL), vuultimo4k)
 else ifeq ($(BOXMODEL), vuzero4k)
  KERNEL_VER    = 4.1.20-1.9
-  KERNEL_TMP    = linux
+  KERNEL_DIR    = linux
  KERNEL_SOURCE = stblinux-4.1-1.9.tar.bz2
  KERNEL_SITE   = http://archive.vuplus.com/download/kernel
@ -147,7 +147,7 @@ else ifeq ($(BOXMODEL), vuzero4k)
 else ifeq ($(BOXMODEL), vuuno4k)
  KERNEL_VER    = 3.14.28-1.12
-  KERNEL_TMP    = linux
+  KERNEL_DIR    = linux
  KERNEL_SOURCE = stblinux-3.14-1.12.tar.bz2
  KERNEL_SITE   = http://archive.vuplus.com/download/kernel
@ -163,7 +163,7 @@ else ifeq ($(BOXMODEL), vuuno4k)
 else ifeq ($(BOXMODEL), vuuno4kse)
  KERNEL_VER    = 4.1.20-1.9
-  KERNEL_TMP    = linux
+  KERNEL_DIR    = linux
  KERNEL_SOURCE = stblinux-4.1-1.9.tar.bz2
  KERNEL_SITE   = http://archive.vuplus.com/download/kernel
@ -179,7 +179,7 @@ else ifeq ($(BOXMODEL), vuuno4kse)
 else ifeq ($(BOXMODEL), vuduo)
  KERNEL_VER    = 3.9.6
-  KERNEL_TMP    = linux
+  KERNEL_DIR    = linux
  KERNEL_SOURCE = stblinux-$(KERNEL_VER).tar.bz2
  KERNEL_SITE   = http://archive.vuplus.com/download/kernel
@ -221,7 +221,7 @@ KERNEL_MAKEVARS = \
 # Compatibility variables
 KERNEL_MAKEVARS += \
 	KVER=$(KERNEL_VER) \
-	KSRC=$(BUILD_DIR)/$(KERNEL_TMP)
+	KSRC=$(BUILD_DIR)/$(KERNEL_DIR)
 ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vuduo))
  KERNEL_IMAGE = vmlinux
--- a/make/host-tools.mk
+++ b/make/host-tools.mk
@ -35,7 +35,7 @@ pkg-config-preqs:
 # -----------------------------------------------------------------------------
 HOST_PKG-CONFIG_VER    = 0.29.2
-HOST_PKG-CONFIG_TMP    = pkg-config-$(HOST_PKG-CONFIG_VER)
+HOST_PKG-CONFIG_DIR    = pkg-config-$(HOST_PKG-CONFIG_VER)
 HOST_PKG-CONFIG_SOURCE = pkg-config-$(HOST_PKG-CONFIG_VER).tar.gz
 HOST_PKG-CONFIG_SITE   = https://pkg-config.freedesktop.org/releases
@ -46,20 +46,20 @@ HOST_PKG-CONFIG = $(HOST_DIR)/bin/pkg-config
 host-pkg-config: $(HOST_PKG-CONFIG)
 $(HOST_PKG-CONFIG): $(DL_DIR)/$(HOST_PKG-CONFIG_SOURCE) | $(HOST_DIR) pkg-config-preqs
-	$(REMOVE)/$(HOST_PKG-CONFIG_TMP)
+	$(REMOVE)/$(HOST_PKG-CONFIG_DIR)
 	$(UNTAR)/$(HOST_PKG-CONFIG_SOURCE)
-	$(CHDIR)/$(HOST_PKG-CONFIG_TMP); \
+	$(CHDIR)/$(HOST_PKG-CONFIG_DIR); \
 		./configure \
 			--with-pc_path=$(PKG_CONFIG_PATH) \
 			; \
 		$(MAKE); \
 		$(INSTALL_EXEC) -D pkg-config $(HOST_PKG-CONFIG)
-	$(REMOVE)/$(HOST_PKG-CONFIG_TMP)
+	$(REMOVE)/$(HOST_PKG-CONFIG_DIR)
 # -----------------------------------------------------------------------------
 HOST_PKGCONF_VER    = 1.6.3
-HOST_PKGCONF_TMP    = pkgconf-$(HOST_PKGCONF_VER)
+HOST_PKGCONF_DIR    = pkgconf-$(HOST_PKGCONF_VER)
 HOST_PKGCONF_SOURCE = pkgconf-$(HOST_PKGCONF_VER).tar.gz
 HOST_PKGCONF_SITE   = https://distfiles.dereferenced.org/pkgconf
@ -70,9 +70,9 @@ HOST_PKGCONF_PATCH  = 0001-Only-prefix-with-the-sysroot-a-subset-of-variables.pa
 HOST_PKGCONF_PATCH += 0002-Revert-main-assume-modversion-insted-of-version-if-o.patch
 host-pkgconf: $(DL_DIR)/$(HOST_PKGCONF_SOURCE) | $(HOST_DIR) pkg-config-preqs
-	$(REMOVE)/$(HOST_PKGCONF_TMP)
+	$(REMOVE)/$(HOST_PKGCONF_DIR)
 	$(UNTAR)/$(HOST_PKGCONF_SOURCE)
-	$(CHDIR)/$(HOST_PKGCONF_TMP); \
+	$(CHDIR)/$(HOST_PKGCONF_DIR); \
 		$(call apply_patches, $(addprefix $(@F)/,$(HOST_PKGCONF_PATCH))); \
 		./configure \
 			--prefix=$(HOST_DIR) \
@ -83,7 +83,7 @@ host-pkgconf: $(DL_DIR)/$(HOST_PKGCONF_SOURCE) | $(HOST_DIR) pkg-config-preqs
 		$(MAKE); \
 		$(MAKE) install
 	$(INSTALL_EXEC) $(PATCHES)/$(@F)/pkgconf-pkg-config $(HOST_PKG-CONFIG)
-	$(REMOVE)/$(HOST_PKGCONF_TMP)
+	$(REMOVE)/$(HOST_PKGCONF_DIR)
 # -----------------------------------------------------------------------------
@ -93,7 +93,7 @@ $(PKG_CONFIG): $(HOST_PKG-CONFIG)
 # -----------------------------------------------------------------------------
 HOST_MTD-UTILS_VER    = $(MTD-UTILS_VER)
-HOST_MTD-UTILS_TMP    = mtd-utils-$(HOST_MTD-UTILS_VER)
+HOST_MTD-UTILS_DIR    = mtd-utils-$(HOST_MTD-UTILS_VER)
 HOST_MTD-UTILS_SOURCE = mtd-utils-$(HOST_MTD-UTILS_VER).tar.bz2
 HOST_MTD-UTILS_SITE   = ftp://ftp.infradead.org/pub/mtd-utils
@ -101,9 +101,9 @@ HOST_MTD-UTILS_SITE   = ftp://ftp.infradead.org/pub/mtd-utils
 #	$(DOWNLOAD) $(HOST_MTD-UTILS_SITE)/$(HOST_MTD-UTILS_SOURCE)
 host-mtd-utils: $(DL_DIR)/$(HOST_MTD-UTILS_SOURCE) | $(HOST_DIR)
-	$(REMOVE)/$(HOST_MTD-UTILS_TMP)
+	$(REMOVE)/$(HOST_MTD-UTILS_DIR)
 	$(UNTAR)/$(HOST_MTD-UTILS_SOURCE)
-	$(CHDIR)/$(HOST_MTD-UTILS_TMP); \
+	$(CHDIR)/$(HOST_MTD-UTILS_DIR); \
 		./configure \
 			ZLIB_CFLAGS=" " \
 			ZLIB_LIBS="-lz" \
@ -117,13 +117,13 @@ host-mtd-utils: $(DL_DIR)/$(HOST_MTD-UTILS_SOURCE) | $(HOST_DIR)
 			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(HOST_DIR)
-	$(REMOVE)/$(HOST_MTD-UTILS_TMP)
+	$(REMOVE)/$(HOST_MTD-UTILS_DIR)
 	$(TOUCH)
 # -----------------------------------------------------------------------------
 HOST_U-BOOT_VER    = 2018.09
-HOST_U-BOOT_TMP    = u-boot-$(HOST_U-BOOT_VER)
+HOST_U-BOOT_DIR    = u-boot-$(HOST_U-BOOT_VER)
 HOST_U-BOOT_SOURCE = u-boot-$(HOST_U-BOOT_VER).tar.bz2
 HOST_U-BOOT_SITE   = ftp://ftp.denx.de/pub/u-boot
@ -132,19 +132,19 @@ $(DL_DIR)/$(HOST_U-BOOT_SOURCE):
 host-mkimage: $(HOST_DIR)/bin/mkimage
 $(HOST_DIR)/bin/mkimage: $(DL_DIR)/$(HOST_U-BOOT_SOURCE) | $(HOST_DIR)
-	$(REMOVE)/$(HOST_U-BOOT_TMP)
+	$(REMOVE)/$(HOST_U-BOOT_DIR)
 	$(UNTAR)/$(HOST_U-BOOT_SOURCE)
-	$(CHDIR)/$(HOST_U-BOOT_TMP); \
+	$(CHDIR)/$(HOST_U-BOOT_DIR); \
 		$(MAKE) defconfig; \
 		$(MAKE) silentoldconfig; \
 		$(MAKE) tools-only
-	$(INSTALL_EXEC) -D $(BUILD_DIR)/$(HOST_U-BOOT_TMP)/tools/mkimage $(HOST_DIR)/bin/
+	$(INSTALL_EXEC) -D $(BUILD_DIR)/$(HOST_U-BOOT_DIR)/tools/mkimage $(HOST_DIR)/bin/
-	$(REMOVE)/$(HOST_U-BOOT_TMP)
+	$(REMOVE)/$(HOST_U-BOOT_DIR)
 # -----------------------------------------------------------------------------
 HOST_TZCODE_VER    = 2019b
-HOST_TZCODE_TMP    = tzcode$(HOST_TZCODE_VER)
+HOST_TZCODE_DIR    = tzcode$(HOST_TZCODE_VER)
 HOST_TZCODE_SOURCE = tzcode$(HOST_TZCODE_VER).tar.gz
 HOST_TZCODE_SITE   = ftp://ftp.iana.org/tz/releases
@ -152,7 +152,7 @@ $(DL_DIR)/$(HOST_TZCODE_SOURCE):
 	$(DOWNLOAD) $(HOST_TZCODE_SITE)/$(HOST_TZCODE_SOURCE)
 HOST_TZDATA_VER    = $(TZDATA_VER)
-HOST_TZDATA_TMP    = tzdata$(HOST_TZDATA_VER)
+HOST_TZDATA_DIR    = tzdata$(HOST_TZDATA_VER)
 HOST_TZDATA_SOURCE = tzdata$(HOST_TZDATA_VER).tar.gz
 HOST_TZDATA_SITE   = ftp://ftp.iana.org/tz/releases
@ -162,20 +162,20 @@ HOST_TZDATA_SITE   = ftp://ftp.iana.org/tz/releases
 HOST_ZIC = $(HOST_DIR)/sbin/zic
 host-zic: $(DL_DIR)/$(HOST_TZDATA_SOURCE) $(DL_DIR)/$(HOST_TZCODE_SOURCE) | $(HOST_DIR)
-	$(REMOVE)/$(HOST_TZCODE_TMP)
+	$(REMOVE)/$(HOST_TZCODE_DIR)
-	$(MKDIR)/$(HOST_TZCODE_TMP)
+	$(MKDIR)/$(HOST_TZCODE_DIR)
-	$(CHDIR)/$(HOST_TZCODE_TMP); \
+	$(CHDIR)/$(HOST_TZCODE_DIR); \
 		tar -xf $(DL_DIR)/$(HOST_TZCODE_SOURCE); \
 		tar -xf $(DL_DIR)/$(HOST_TZDATA_SOURCE); \
 		$(MAKE) zic
-	$(INSTALL_EXEC) -D $(BUILD_DIR)/$(HOST_TZCODE_TMP)/zic $(HOST_ZIC)
+	$(INSTALL_EXEC) -D $(BUILD_DIR)/$(HOST_TZCODE_DIR)/zic $(HOST_ZIC)
-	$(REMOVE)/$(HOST_TZCODE_TMP)
+	$(REMOVE)/$(HOST_TZCODE_DIR)
 	$(TOUCH)
 # -----------------------------------------------------------------------------
 HOST_PARTED_VER    = $(PARTED_VER)
-HOST_PARTED_TMP    = parted-$(HOST_PARTED_VER)
+HOST_PARTED_DIR    = parted-$(HOST_PARTED_VER)
 HOST_PARTED_SOURCE = parted-$(HOST_PARTED_VER).tar.xz
 HOST_PARTED_SITE   = https://ftp.gnu.org/gnu/parted
@ -186,9 +186,9 @@ HOST_PARTED_PATCH  = parted-device-mapper.patch
 HOST_PARTED_PATCH += parted-sysmacros.patch
 host-parted: $(DL_DIR)/$(HOST_PARTED_SOURCE) | $(HOST_DIR)
-	$(REMOVE)/$(HOST_PARTED_TMP)
+	$(REMOVE)/$(HOST_PARTED_DIR)
 	$(UNTAR)/$(HOST_PARTED_SOURCE)
-	$(CHDIR)/$(HOST_PARTED_TMP); \
+	$(CHDIR)/$(HOST_PARTED_DIR); \
 		$(call apply_patches, $(HOST_PARTED_PATCH)); \
 		./configure \
 			--prefix= \
@ -200,13 +200,13 @@ host-parted: $(DL_DIR)/$(HOST_PARTED_SOURCE) | $(HOST_DIR)
 			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(HOST_DIR)
-	$(REMOVE)/$(HOST_PARTED_TMP)
+	$(REMOVE)/$(HOST_PARTED_DIR)
 	$(TOUCH)
 # -----------------------------------------------------------------------------
 HOST_DOSFSTOOLS_VER    = $(DOSFSTOOLS_VER)
-HOST_DOSFSTOOLS_TMP    = dosfstools-$(HOST_DOSFSTOOLS_VER)
+HOST_DOSFSTOOLS_DIR    = dosfstools-$(HOST_DOSFSTOOLS_VER)
 HOST_DOSFSTOOLS_SOURCE = dosfstools-$(HOST_DOSFSTOOLS_VER).tar.xz
 HOST_DOSFSTOOLS_SITE   = https://github.com/dosfstools/dosfstools/releases/download/v$(HOST_DOSFSTOOLS_VER)
@ -214,9 +214,9 @@ HOST_DOSFSTOOLS_SITE   = https://github.com/dosfstools/dosfstools/releases/downl
 #	$(DOWNLOAD) $(HOST_DOSFSTOOLS_SITE)/$(HOST_DOSFSTOOLS_SOURCE)
 host-dosfstools: $(DL_DIR)/$(HOST_DOSFSTOOLS_SOURCE) | $(HOST_DIR)
-	$(REMOVE)/$(HOST_DOSFSTOOLS_TMP)
+	$(REMOVE)/$(HOST_DOSFSTOOLS_DIR)
 	$(UNTAR)/$(HOST_DOSFSTOOLS_SOURCE)
-	$(CHDIR)/$(HOST_DOSFSTOOLS_TMP); \
+	$(CHDIR)/$(HOST_DOSFSTOOLS_DIR); \
 		./configure \
 			--prefix= \
 			--without-udev \
@ -226,13 +226,13 @@ host-dosfstools: $(DL_DIR)/$(HOST_DOSFSTOOLS_SOURCE) | $(HOST_DIR)
 	ln -sf mkfs.fat $(HOST_DIR)/sbin/mkfs.vfat
 	ln -sf mkfs.fat $(HOST_DIR)/sbin/mkfs.msdos
 	ln -sf mkfs.fat $(HOST_DIR)/sbin/mkdosfs
-	$(REMOVE)/$(HOST_DOSFSTOOLS_TMP)
+	$(REMOVE)/$(HOST_DOSFSTOOLS_DIR)
 	$(TOUCH)
 # -----------------------------------------------------------------------------
 HOST_MTOOLS_VER    = 4.0.19
-HOST_MTOOLS_TMP    = mtools-$(HOST_MTOOLS_VER)
+HOST_MTOOLS_DIR    = mtools-$(HOST_MTOOLS_VER)
 HOST_MTOOLS_SOURCE = mtools-$(HOST_MTOOLS_VER).tar.gz
 HOST_MTOOLS_SITE   = ftp://ftp.gnu.org/gnu/mtools
@ -240,21 +240,21 @@ $(DL_DIR)/$(HOST_MTOOLS_SOURCE):
 	$(DOWNLOAD) $(HOST_MTOOLS_SITE)/$(HOST_MTOOLS_SOURCE)
 host-mtools: $(DL_DIR)/$(HOST_MTOOLS_SOURCE) | $(HOST_DIR)
-	$(REMOVE)/$(HOST_MTOOLS_TMP)
+	$(REMOVE)/$(HOST_MTOOLS_DIR)
 	$(UNTAR)/$(HOST_MTOOLS_SOURCE)
-	$(CHDIR)/$(HOST_MTOOLS_TMP); \
+	$(CHDIR)/$(HOST_MTOOLS_DIR); \
 		./configure \
 			--prefix= \
 			; \
 		$(MAKE1); \
 		$(MAKE1) install DESTDIR=$(HOST_DIR)
-	$(REMOVE)/$(HOST_MTOOLS_TMP)
+	$(REMOVE)/$(HOST_MTOOLS_DIR)
 	$(TOUCH)
 # -----------------------------------------------------------------------------
 HOST_E2FSPROGS_VER    = $(E2FSPROGS_VER)
-HOST_E2FSPROGS_TMP    = e2fsprogs-$(HOST_E2FSPROGS_VER)
+HOST_E2FSPROGS_DIR    = e2fsprogs-$(HOST_E2FSPROGS_VER)
 HOST_E2FSPROGS_SOURCE = e2fsprogs-$(HOST_E2FSPROGS_VER).tar.gz
 HOST_E2FSPROGS_SITE   = https://sourceforge.net/projects/e2fsprogs/files/e2fsprogs/v$(HOST_E2FSPROGS_VER)
@ -262,21 +262,21 @@ HOST_E2FSPROGS_SITE   = https://sourceforge.net/projects/e2fsprogs/files/e2fspro
 #	$(DOWNLOAD) $(HOST_E2FSPROGS_SITE)/$(HOST_E2FSPROGS_SOURCE)
 host-e2fsprocs: $(DL_DIR)/$(HOST_E2FSPROGS_SOURCE) | $(HOST_DIR)
-	$(REMOVE)/$(HOST_E2FSPROGS_TMP)
+	$(REMOVE)/$(HOST_E2FSPROGS_DIR)
 	$(UNTAR)/$(HOST_E2FSPROGS_SOURCE)
-	$(CHDIR)/$(HOST_E2FSPROGS_TMP); \
+	$(CHDIR)/$(HOST_E2FSPROGS_DIR); \
 		./configure \
 			--prefix= \
 			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(HOST_DIR)
-	$(REMOVE)/$(HOST_E2FSPROGS_TMP)
+	$(REMOVE)/$(HOST_E2FSPROGS_DIR)
 	$(TOUCH)
 # -----------------------------------------------------------------------------
 HOST_NINJA_VER    = 1.10.0
-HOST_NINJA_TMP    = ninja-$(HOST_NINJA_VER)
+HOST_NINJA_DIR    = ninja-$(HOST_NINJA_VER)
 HOST_NINJA_SOURCE = ninja-$(HOST_NINJA_VER).tar.gz
 HOST_NINJA_SITE   = $(call github,ninja-build,ninja,v$(HOST_NINJA_VER))
@ -288,22 +288,22 @@ $(DL_DIR)/$(HOST_NINJA_SOURCE):
 	$(DOWNLOAD) $(HOST_NINJA_SITE)/$(HOST_NINJA_SOURCE)
 host-ninja: $(DL_DIR)/$(HOST_NINJA_SOURCE) | $(HOST_DIR)
-	$(REMOVE)/$(HOST_NINJA_TMP)
+	$(REMOVE)/$(HOST_NINJA_DIR)
 	$(UNTAR)/$(HOST_NINJA_SOURCE)
-	$(CHDIR)/$(HOST_NINJA_TMP); \
+	$(CHDIR)/$(HOST_NINJA_DIR); \
 		$(call apply_patches, $(HOST_NINJA_PATCH)); \
 		cmake . \
 			-DCMAKE_INSTALL_PREFIX="" \
 			; \
 		$(MAKE)
-	$(INSTALL_EXEC) -D $(BUILD_DIR)/$(HOST_NINJA_TMP)/ninja $(HOST_DIR)/bin/ninja
+	$(INSTALL_EXEC) -D $(BUILD_DIR)/$(HOST_NINJA_DIR)/ninja $(HOST_DIR)/bin/ninja
-	$(REMOVE)/$(HOST_NINJA_TMP)
+	$(REMOVE)/$(HOST_NINJA_DIR)
 	$(TOUCH)
 # -----------------------------------------------------------------------------
 HOST_LUA_VER    = $(LUA_VER)
-HOST_LUA_TMP    = lua-$(HOST_LUA_VER)
+HOST_LUA_DIR    = lua-$(HOST_LUA_VER)
 HOST_LUA_SOURCE = lua-$(HOST_LUA_VER).tar.gz
 HOST_LUA_SITE   = http://www.lua.org/ftp
@ -316,19 +316,19 @@ HOST_LUA_PATCH += lua-01-remove-readline.patch
 HOST_LUA = $(HOST_DIR)/bin/lua
 host-lua: $(DL_DIR)/$(HOST_LUA_SOURCE) | $(HOST_DIR)
-	$(REMOVE)/$(HOST_LUA_TMP)
+	$(REMOVE)/$(HOST_LUA_DIR)
 	$(UNTAR)/$(HOST_LUA_SOURCE)
-	$(CHDIR)/$(HOST_LUA_TMP); \
+	$(CHDIR)/$(HOST_LUA_DIR); \
 		$(call apply_patches, $(HOST_LUA_PATCH)); \
 		$(MAKE) linux; \
 		$(MAKE) install INSTALL_TOP=$(HOST_DIR)
-	$(REMOVE)/$(HOST_LUA_TMP)
+	$(REMOVE)/$(HOST_LUA_DIR)
 	$(TOUCH)
 # -----------------------------------------------------------------------------
 HOST_LUAROCKS_VER    = 3.1.3
-HOST_LUAROCKS_TMP    = luarocks-$(HOST_LUAROCKS_VER)
+HOST_LUAROCKS_DIR    = luarocks-$(HOST_LUAROCKS_VER)
 HOST_LUAROCKS_SOURCE = luarocks-$(HOST_LUAROCKS_VER).tar.gz
 HOST_LUAROCKS_SITE   = https://luarocks.github.io/luarocks/releases
@ -353,9 +353,9 @@ HOST_LUAROCKS = $(HOST_DIR)/bin/luarocks
 host-luarocks: $(HOST_LUAROCKS)
 $(HOST_LUAROCKS): $(HOST_LUA) $(DL_DIR)/$(HOST_LUAROCKS_SOURCE) | $(HOST_DIR)
-	$(REMOVE)/$(HOST_LUAROCKS_TMP)
+	$(REMOVE)/$(HOST_LUAROCKS_DIR)
 	$(UNTAR)/$(HOST_LUAROCKS_SOURCE)
-	$(CHDIR)/$(HOST_LUAROCKS_TMP); \
+	$(CHDIR)/$(HOST_LUAROCKS_DIR); \
 		$(call apply_patches, $(HOST_LUAROCKS_PATCH)); \
 		./configure $(SILENT_OPT) \
 			--prefix=$(HOST_DIR) \
@ -367,7 +367,7 @@ $(HOST_LUAROCKS): $(HOST_LUA) $(DL_DIR)/$(HOST_LUAROCKS_SOURCE) | $(HOST_DIR)
 		$(MAKE); \
 		$(MAKE) install
 	cat $(CONFIGS)/luarocks-config.lua >> $(HOST_LUAROCKS_CONFIG_FILE)
-	$(REMOVE)/$(HOST_LUAROCKS_TMP)
+	$(REMOVE)/$(HOST_LUAROCKS_DIR)
 # -----------------------------------------------------------------------------
--- a/make/images.mk
+++ b/make/images.mk
@ -115,17 +115,17 @@ endif
 flash-image-hd5x: IMAGE_DATE=$(shell cat $(ROOTFS)/.version | grep "^version=" | cut -d= -f2 | cut -c 5-)
 flash-image-hd5x: | $(IMAGE_DIR)
-	rm -rf $(IMAGE_BUILD_TMP)
+	rm -rf $(IMAGE_BUILD_DIR)
-	mkdir -p $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)
+	mkdir -p $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)
-	cp $(KERNEL_ZIMAGE_DTB) $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/kernel.bin
+	cp $(KERNEL_ZIMAGE_DTB) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/kernel.bin
 	$(CD) $(ROOTFS); \
-		tar -cvf $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/rootfs.tar -C $(ROOTFS) . >/dev/null 2>&1; \
+		tar -cvf $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/rootfs.tar -C $(ROOTFS) . >/dev/null 2>&1; \
-		bzip2 $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/rootfs.tar
+		bzip2 $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/rootfs.tar
 	# Create minimal image
-	$(CD) $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR); \
+	$(CD) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR); \
 		tar -czf $(IMAGE_DIR)/$(IMAGE_NAME).tgz kernel.bin rootfs.tar.bz2
 	echo $(IMAGE_SITE)/$(IMAGE_NAME).tgz $(IMAGE_TYPE)$(IMAGE_VER)$(IMAGE_DATE) `md5sum $(IMAGE_DIR)/$(IMAGE_NAME).tgz | cut -c1-32` $(IMAGE_DESC) $(IMAGE_VERSION) >> $(IMAGE_DIR)/$(IMAGE_MD5FILE)
-	rm -rf $(IMAGE_BUILD_TMP)
+	rm -rf $(IMAGE_BUILD_DIR)
 # -----------------------------------------------------------------------------
@ -136,7 +136,7 @@ HD5x_IMAGE_LINK = $(HD5x_IMAGE_NAME).ext4
 # emmc image
 EMMC_IMAGE_SIZE = 3817472
-EMMC_IMAGE = $(IMAGE_BUILD_TMP)/$(HD5x_IMAGE_NAME).img
+EMMC_IMAGE = $(IMAGE_BUILD_DIR)/$(HD5x_IMAGE_NAME).img
 BLOCK_SIZE = 512
 BLOCK_SECTOR = 2
@ -166,13 +166,13 @@ STORAGE_PARTITION_OFFSET = "$(shell expr $(LINUX_SWAP_PARTITION_OFFSET) \+ $(LIN
 #STORAGE_PARTITION_SIZE = 204800 # remaining flash memory
 flash-image-hd5x-multi: | $(IMAGE_DIR)
-	rm -rf $(IMAGE_BUILD_TMP)
+	rm -rf $(IMAGE_BUILD_DIR)
-	mkdir -p $(IMAGE_BUILD_TMP)
+	mkdir -p $(IMAGE_BUILD_DIR)
 	# Create a sparse image block
-	dd if=/dev/zero of=$(IMAGE_BUILD_TMP)/$(HD5x_IMAGE_LINK) seek=$(shell expr $(ROOTFS_PARTITION_SIZE) \* $(BLOCK_SECTOR)) count=0 bs=$(BLOCK_SIZE)
+	dd if=/dev/zero of=$(IMAGE_BUILD_DIR)/$(HD5x_IMAGE_LINK) seek=$(shell expr $(ROOTFS_PARTITION_SIZE) \* $(BLOCK_SECTOR)) count=0 bs=$(BLOCK_SIZE)
-	mkfs.ext4 -v -F $(IMAGE_BUILD_TMP)/$(HD5x_IMAGE_LINK) -d $(ROOTFS)/..
+	mkfs.ext4 -v -F $(IMAGE_BUILD_DIR)/$(HD5x_IMAGE_LINK) -d $(ROOTFS)/..
 	# Error codes 0-3 indicate successfull operation of fsck (no errors or errors corrected)
-	fsck.ext4 -pvfD $(IMAGE_BUILD_TMP)/$(HD5x_IMAGE_LINK) || [ $? -le 3 ]
+	fsck.ext4 -pvfD $(IMAGE_BUILD_DIR)/$(HD5x_IMAGE_LINK) || [ $? -le 3 ]
 	dd if=/dev/zero of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) count=0 seek=$(shell expr $(EMMC_IMAGE_SIZE) \* $(BLOCK_SECTOR))
 	parted -s $(EMMC_IMAGE) mklabel gpt
 	parted -s $(EMMC_IMAGE) unit KiB mkpart boot fat16 $(IMAGE_ROOTFS_ALIGNMENT) $(shell expr $(IMAGE_ROOTFS_ALIGNMENT) \+ $(BOOT_PARTITION_SIZE))
@ -184,52 +184,52 @@ flash-image-hd5x-multi: | $(IMAGE_DIR)
 	parted -s $(EMMC_IMAGE) unit KiB mkpart userdata ext4 $(MULTI_ROOTFS_PARTITION_OFFSET) $(shell expr $(MULTI_ROOTFS_PARTITION_OFFSET) \+ $(MULTI_ROOTFS_PARTITION_SIZE))
 	parted -s $(EMMC_IMAGE) unit KiB mkpart swap linux-swap $(LINUX_SWAP_PARTITION_OFFSET) $(shell expr $(LINUX_SWAP_PARTITION_OFFSET) \+ $(LINUX_SWAP_PARTITION_SIZE))
 	parted -s $(EMMC_IMAGE) unit KiB mkpart storage ext4 $(STORAGE_PARTITION_OFFSET) 100%
-	dd if=/dev/zero of=$(IMAGE_BUILD_TMP)/$(HD5x_BOOT_IMAGE) bs=$(BLOCK_SIZE) count=$(shell expr $(BOOT_PARTITION_SIZE) \* $(BLOCK_SECTOR))
+	dd if=/dev/zero of=$(IMAGE_BUILD_DIR)/$(HD5x_BOOT_IMAGE) bs=$(BLOCK_SIZE) count=$(shell expr $(BOOT_PARTITION_SIZE) \* $(BLOCK_SECTOR))
-	mkfs.msdos -S 512 $(IMAGE_BUILD_TMP)/$(HD5x_BOOT_IMAGE)
+	mkfs.msdos -S 512 $(IMAGE_BUILD_DIR)/$(HD5x_BOOT_IMAGE)
-	echo "boot emmcflash0.linuxkernel  'root=/dev/mmcblk0p3 rootsubdir=linuxrootfs1 kernel=/dev/mmcblk0p2 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_TMP)/STARTUP
+	echo "boot emmcflash0.linuxkernel  'root=/dev/mmcblk0p3 rootsubdir=linuxrootfs1 kernel=/dev/mmcblk0p2 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_DIR)/STARTUP
-	echo "boot emmcflash0.linuxkernel  'root=/dev/mmcblk0p3 rootsubdir=linuxrootfs1 kernel=/dev/mmcblk0p2 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_TMP)/STARTUP_1
+	echo "boot emmcflash0.linuxkernel  'root=/dev/mmcblk0p3 rootsubdir=linuxrootfs1 kernel=/dev/mmcblk0p2 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_DIR)/STARTUP_1
-	echo "boot emmcflash0.linuxkernel2 'root=/dev/mmcblk0p7 rootsubdir=linuxrootfs2 kernel=/dev/mmcblk0p4 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_TMP)/STARTUP_2
+	echo "boot emmcflash0.linuxkernel2 'root=/dev/mmcblk0p7 rootsubdir=linuxrootfs2 kernel=/dev/mmcblk0p4 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_DIR)/STARTUP_2
-	echo "boot emmcflash0.linuxkernel3 'root=/dev/mmcblk0p7 rootsubdir=linuxrootfs3 kernel=/dev/mmcblk0p5 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_TMP)/STARTUP_3
+	echo "boot emmcflash0.linuxkernel3 'root=/dev/mmcblk0p7 rootsubdir=linuxrootfs3 kernel=/dev/mmcblk0p5 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_DIR)/STARTUP_3
-	echo "boot emmcflash0.linuxkernel4 'root=/dev/mmcblk0p7 rootsubdir=linuxrootfs4 kernel=/dev/mmcblk0p6 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_TMP)/STARTUP_4
+	echo "boot emmcflash0.linuxkernel4 'root=/dev/mmcblk0p7 rootsubdir=linuxrootfs4 kernel=/dev/mmcblk0p6 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_DIR)/STARTUP_4
-	mcopy -i $(IMAGE_BUILD_TMP)/$(HD5x_BOOT_IMAGE) -v $(IMAGE_BUILD_TMP)/STARTUP ::
+	mcopy -i $(IMAGE_BUILD_DIR)/$(HD5x_BOOT_IMAGE) -v $(IMAGE_BUILD_DIR)/STARTUP ::
-	mcopy -i $(IMAGE_BUILD_TMP)/$(HD5x_BOOT_IMAGE) -v $(IMAGE_BUILD_TMP)/STARTUP_1 ::
+	mcopy -i $(IMAGE_BUILD_DIR)/$(HD5x_BOOT_IMAGE) -v $(IMAGE_BUILD_DIR)/STARTUP_1 ::
-	mcopy -i $(IMAGE_BUILD_TMP)/$(HD5x_BOOT_IMAGE) -v $(IMAGE_BUILD_TMP)/STARTUP_2 ::
+	mcopy -i $(IMAGE_BUILD_DIR)/$(HD5x_BOOT_IMAGE) -v $(IMAGE_BUILD_DIR)/STARTUP_2 ::
-	mcopy -i $(IMAGE_BUILD_TMP)/$(HD5x_BOOT_IMAGE) -v $(IMAGE_BUILD_TMP)/STARTUP_3 ::
+	mcopy -i $(IMAGE_BUILD_DIR)/$(HD5x_BOOT_IMAGE) -v $(IMAGE_BUILD_DIR)/STARTUP_3 ::
-	mcopy -i $(IMAGE_BUILD_TMP)/$(HD5x_BOOT_IMAGE) -v $(IMAGE_BUILD_TMP)/STARTUP_4 ::
+	mcopy -i $(IMAGE_BUILD_DIR)/$(HD5x_BOOT_IMAGE) -v $(IMAGE_BUILD_DIR)/STARTUP_4 ::
-	dd conv=notrunc if=$(IMAGE_BUILD_TMP)/$(HD5x_BOOT_IMAGE) of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) seek=$(shell expr $(IMAGE_ROOTFS_ALIGNMENT) \* $(BLOCK_SECTOR))
+	dd conv=notrunc if=$(IMAGE_BUILD_DIR)/$(HD5x_BOOT_IMAGE) of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) seek=$(shell expr $(IMAGE_ROOTFS_ALIGNMENT) \* $(BLOCK_SECTOR))
 	dd conv=notrunc if=$(KERNEL_ZIMAGE_DTB) of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) seek=$(shell expr $(KERNEL_PARTITION_OFFSET) \* $(BLOCK_SECTOR))
-	resize2fs $(IMAGE_BUILD_TMP)/$(HD5x_IMAGE_LINK) $(ROOTFS_PARTITION_SIZE)k
+	resize2fs $(IMAGE_BUILD_DIR)/$(HD5x_IMAGE_LINK) $(ROOTFS_PARTITION_SIZE)k
 	# Truncate on purpose
-	dd if=$(IMAGE_BUILD_TMP)/$(HD5x_IMAGE_LINK) of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) seek=$(shell expr $(ROOTFS_PARTITION_OFFSET) \* $(BLOCK_SECTOR))
+	dd if=$(IMAGE_BUILD_DIR)/$(HD5x_IMAGE_LINK) of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) seek=$(shell expr $(ROOTFS_PARTITION_OFFSET) \* $(BLOCK_SECTOR))
 	# Create final USB-image
-	mkdir -p $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)
+	mkdir -p $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)
-	cp $(EMMC_IMAGE) $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)
+	cp $(EMMC_IMAGE) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)
-	cp $(TARGET_FILES)/splash-images/ni-splash.bmp $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/splash.bin
+	cp $(TARGET_FILES)/splash-images/ni-splash.bmp $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/splash.bin
-	cp $(KERNEL_ZIMAGE_DTB) $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/kernel.bin
+	cp $(KERNEL_ZIMAGE_DTB) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/kernel.bin
 	$(CD) $(ROOTFS); \
-		tar -cvf $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/rootfs.tar -C $(ROOTFS) . >/dev/null 2>&1; \
+		tar -cvf $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/rootfs.tar -C $(ROOTFS) . >/dev/null 2>&1; \
-		bzip2 $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/rootfs.tar
+		bzip2 $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/rootfs.tar
-	echo $(IMAGE_PREFIX) > $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/imageversion
+	echo $(IMAGE_PREFIX) > $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/imageversion
-	$(CD) $(IMAGE_BUILD_TMP); \
+	$(CD) $(IMAGE_BUILD_DIR); \
 		zip -r $(IMAGE_DIR)/$(IMAGE_NAME)_multi_usb.zip $(IMAGE_SUBDIR)/*
-	rm -rf $(IMAGE_BUILD_TMP)
+	rm -rf $(IMAGE_BUILD_DIR)
 # -----------------------------------------------------------------------------
 # hd60, hd61
 flash-image-hd6x: IMAGE_DATE=$(shell cat $(ROOTFS)/.version | grep "^version=" | cut -d= -f2 | cut -c 5-)
 flash-image-hd6x: | $(IMAGE_DIR)
-	rm -rf $(IMAGE_BUILD_TMP)
+	rm -rf $(IMAGE_BUILD_DIR)
-	mkdir -p $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)
+	mkdir -p $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)
-	cp $(KERNEL_UIMAGE) $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/uImage
+	cp $(KERNEL_UIMAGE) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/uImage
 	$(CD) $(ROOTFS); \
-		tar -cvf $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/rootfs.tar -C $(ROOTFS) . >/dev/null 2>&1; \
+		tar -cvf $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/rootfs.tar -C $(ROOTFS) . >/dev/null 2>&1; \
-		bzip2 $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/rootfs.tar
+		bzip2 $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/rootfs.tar
 	# Create minimal image
-	$(CD) $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR); \
+	$(CD) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR); \
 		tar -czf $(IMAGE_DIR)/$(IMAGE_NAME).tgz uImage rootfs.tar.bz2
 	echo $(IMAGE_SITE)/$(IMAGE_NAME).tgz $(IMAGE_TYPE)$(IMAGE_VER)$(IMAGE_DATE) `md5sum $(IMAGE_DIR)/$(IMAGE_NAME).tgz | cut -c1-32` $(IMAGE_DESC) $(IMAGE_VERSION) >> $(IMAGE_DIR)/$(IMAGE_MD5FILE)
-	rm -rf $(IMAGE_BUILD_TMP)
+	rm -rf $(IMAGE_BUILD_DIR)
 # -----------------------------------------------------------------------------
@ -240,47 +240,47 @@ flash-image-hd6x-multi:
 # armbox vu+
 flash-image-vuplus: IMAGE_DATE=$(shell cat $(ROOTFS)/.version | grep "^version=" | cut -d= -f2 | cut -c 5-)
 flash-image-vuplus: | $(IMAGE_DIR)
-	rm -rf $(IMAGE_BUILD_TMP)
+	rm -rf $(IMAGE_BUILD_DIR)
-	mkdir -p $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)
+	mkdir -p $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)
-	cp $(KERNEL_ZIMAGE) $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/kernel_auto.bin
+	cp $(KERNEL_ZIMAGE) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/kernel_auto.bin
 	$(CD) $(ROOTFS); \
-		tar -cvf $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/rootfs.tar -C $(ROOTFS) . >/dev/null 2>&1; \
+		tar -cvf $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/rootfs.tar -C $(ROOTFS) . >/dev/null 2>&1; \
-		bzip2 $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/rootfs.tar
+		bzip2 $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/rootfs.tar
 	# Create minimal image
-	$(CD) $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR); \
+	$(CD) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR); \
 		tar -czf $(IMAGE_DIR)/$(IMAGE_NAME).tgz kernel_auto.bin rootfs.tar.bz2
 	echo $(IMAGE_SITE)/$(IMAGE_NAME).tgz $(IMAGE_TYPE)$(IMAGE_VER)$(IMAGE_DATE) `md5sum $(IMAGE_DIR)/$(IMAGE_NAME).tgz | cut -c1-32` $(IMAGE_DESC) $(IMAGE_VERSION) >> $(IMAGE_DIR)/$(IMAGE_MD5FILE)
-	rm -rf $(IMAGE_BUILD_TMP)
+	rm -rf $(IMAGE_BUILD_DIR)
 flash-image-vuplus-multi: vmlinuz-initrd
 flash-image-vuplus-multi: | $(IMAGE_DIR)
-	rm -rf $(IMAGE_BUILD_TMP)
+	rm -rf $(IMAGE_BUILD_DIR)
-	mkdir -p $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)
+	mkdir -p $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)
-	cp $(TARGET_FILES)/splash-images/ni-splash.bmp $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/splash_auto.bin
+	cp $(TARGET_FILES)/splash-images/ni-splash.bmp $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/splash_auto.bin
-	cp $(BUILD_DIR)/$(VMLINUZ-INITRD) $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/initrd_auto.bin
+	cp $(BUILD_DIR)/$(VMLINUZ-INITRD) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/initrd_auto.bin
-	echo Dummy for update. > $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/kernel_auto.bin
+	echo Dummy for update. > $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/kernel_auto.bin
-	cp $(KERNEL_ZIMAGE) $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/kernel1_auto.bin
+	cp $(KERNEL_ZIMAGE) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/kernel1_auto.bin
-	cp $(KERNEL_ZIMAGE) $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/kernel2_auto.bin
+	cp $(KERNEL_ZIMAGE) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/kernel2_auto.bin
-	cp $(KERNEL_ZIMAGE) $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/kernel3_auto.bin
+	cp $(KERNEL_ZIMAGE) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/kernel3_auto.bin
-	cp $(KERNEL_ZIMAGE) $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/kernel4_auto.bin
+	cp $(KERNEL_ZIMAGE) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/kernel4_auto.bin
-	echo Dummy for update. > $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/rootfs.tar.bz2
+	echo Dummy for update. > $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/rootfs.tar.bz2
 	$(CD) $(ROOTFS); \
-		tar -cvf $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/rootfs1.tar -C $(ROOTFS) . >/dev/null 2>&1; \
+		tar -cvf $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/rootfs1.tar -C $(ROOTFS) . >/dev/null 2>&1; \
-		bzip2 $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/rootfs1.tar
+		bzip2 $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/rootfs1.tar
-	echo Dummy for update. > $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/rootfs2.tar.bz2
+	echo Dummy for update. > $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/rootfs2.tar.bz2
-	echo Dummy for update. > $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/rootfs3.tar.bz2
+	echo Dummy for update. > $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/rootfs3.tar.bz2
-	echo Dummy for update. > $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/rootfs4.tar.bz2
+	echo Dummy for update. > $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/rootfs4.tar.bz2
 ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vuzero4k vuuno4k))
-	echo This file forces the update. > $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/force.update
+	echo This file forces the update. > $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/force.update
 else
-	echo This file forces a reboot after the update. > $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/reboot.update
+	echo This file forces a reboot after the update. > $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/reboot.update
 endif
-	echo This file forces creating partitions. > $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/mkpart.update
+	echo This file forces creating partitions. > $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/mkpart.update
-	echo $(IMAGE_PREFIX) > $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/imageversion
+	echo $(IMAGE_PREFIX) > $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/imageversion
 	# Create final USB-image
-	$(CD) $(IMAGE_BUILD_TMP); \
+	$(CD) $(IMAGE_BUILD_DIR); \
 		zip -r $(IMAGE_DIR)/$(IMAGE_NAME)_multi_usb.zip $(IMAGE_SUBDIR)/*
-	rm -rf $(IMAGE_BUILD_TMP)
+	rm -rf $(IMAGE_BUILD_DIR)
 # -----------------------------------------------------------------------------
--- a/make/linux-drivers.mk
+++ b/make/linux-drivers.mk
@ -21,7 +21,7 @@ rtl8192eu: kernel-$(BOXTYPE) | $(TARGET_DIR)
 # -----------------------------------------------------------------------------
 HD6x-MALI-DRIVERS_VER    = DX910-SW-99002-r7p0-00rel0
-HD6x-MALI-DRIVERS_TMP    = $(HD6x-MALI-DRIVERS_VER)
+HD6x-MALI-DRIVERS_DIR    = $(HD6x-MALI-DRIVERS_VER)
 HD6x-MALI-DRIVERS_SOURCE = $(HD6x-MALI-DRIVERS_VER).tgz
 HD6x-MALI-DRIVERS_SITE   = https://developer.arm.com/-/media/Files/downloads/mali-drivers/kernel/mali-utgard-gpu
@ -31,7 +31,7 @@ $(DL_DIR)/$(HD6x-MALI-DRIVERS_SOURCE):
 HD6x-MALI-DRIVERS_PATCH  = hi3798mv200-support.patch
 HD6x-MALI-DRIVERS_MAKEVARS = \
-	M=$(BUILD_DIR)/$(HD6x-MALI-DRIVERS_TMP)/driver/src/devicedrv/mali \
+	M=$(BUILD_DIR)/$(HD6x-MALI-DRIVERS_DIR)/driver/src/devicedrv/mali \
 	EXTRA_CFLAGS="-DCONFIG_MALI_DVFS=y -DCONFIG_GPU_AVS_ENABLE=y" \
 	CONFIG_MALI_SHARED_INTERRUPTS=y \
 	CONFIG_MALI400=m \
@ -41,12 +41,12 @@ HD6x-MALI-DRIVERS_MAKEVARS = \
 hd6x-mali-drivers: kernel-$(BOXTYPE) hd6x-libgles-headers $(DL_DIR)/$(HD6x-MALI-DRIVERS_SOURCE) | $(TARGET_DIR)
 	$(START_BUILD)
-	$(REMOVE)/$(HD6x-MALI-DRIVERS_TMP)
+	$(REMOVE)/$(HD6x-MALI-DRIVERS_DIR)
 	$(UNTAR)/$(HD6x-MALI-DRIVERS_SOURCE)
-	$(CHDIR)/$(HD6x-MALI-DRIVERS_TMP); \
+	$(CHDIR)/$(HD6x-MALI-DRIVERS_DIR); \
 		$(call apply_patches, $(HD6x-MALI-DRIVERS_PATCH)); \
 		$(MAKE) -C $(BUILD_DIR)/$(KERNEL_OBJ) $(KERNEL_MAKEVARS) $(HD6x-MALI-DRIVERS_MAKEVARS); \
 		$(MAKE) -C $(BUILD_DIR)/$(KERNEL_OBJ) $(KERNEL_MAKEVARS) $(HD6x-MALI-DRIVERS_MAKEVARS) INSTALL_MOD_PATH=$(TARGET_DIR) modules_install
 	make depmod
-	$(REMOVE)/$(HD6x-MALI-DRIVERS_TMP)
+	$(REMOVE)/$(HD6x-MALI-DRIVERS_DIR)
 	$(TOUCH)
--- a/make/linux-kernel.mk
+++ b/make/linux-kernel.mk
@ -218,19 +218,19 @@ endif
 kernel.do_prepare.git:
 	$(MAKE) kernel.do_checkout
 	#
-	$(REMOVE)/$(KERNEL_TMP)
+	$(REMOVE)/$(KERNEL_DIR)
 	tar -C $(SOURCE_DIR) -cp $(NI-LINUX-KERNEL) --exclude-vcs | tar -C $(BUILD_DIR) -x
 	$(CD) $(BUILD_DIR); \
-		mv $(NI-LINUX-KERNEL) $(KERNEL_TMP)
+		mv $(NI-LINUX-KERNEL) $(KERNEL_DIR)
 kernel.do_prepare.tar: $(DL_DIR)/$(KERNEL_SOURCE)
-	$(REMOVE)/$(KERNEL_TMP)
+	$(REMOVE)/$(KERNEL_DIR)
 	$(UNTAR)/$(KERNEL_SOURCE)
-	$(CHDIR)/$(KERNEL_TMP); \
+	$(CHDIR)/$(KERNEL_DIR); \
 		$(call apply_patches, $(addprefix kernel/,$(KERNEL_PATCH)))
 kernel.do_compile: kernel.do_prepare
-	$(CHDIR)/$(KERNEL_TMP); \
+	$(CHDIR)/$(KERNEL_DIR); \
 		$(MAKE) $(KERNEL_MAKEVARS) silentoldconfig; \
 		$(MAKE) $(KERNEL_MAKEVARS) $(KERNEL_MAKEOPTS); \
 		$(MAKE) $(KERNEL_MAKEVARS) modules_install
--- a/make/neutrino-plugins.mk
+++ b/make/neutrino-plugins.mk
@ -179,18 +179,18 @@ doscam-webif-skin:
 # -----------------------------------------------------------------------------
 NEUTRINO-MEDIATHEK_VER    = git
-NEUTRINO-MEDIATHEK_TMP    = mediathek.$(NEUTRINO-MEDIATHEK_VER)
+NEUTRINO-MEDIATHEK_DIR    = mediathek.$(NEUTRINO-MEDIATHEK_VER)
 NEUTRINO-MEDIATHEK_SOURCE = mediathek.$(NEUTRINO-MEDIATHEK_VER)
 NEUTRINO-MEDIATHEK_SITE   = https://github.com/neutrino-mediathek
 neutrino-mediathek: $(SHARE_PLUGINS) | $(TARGET_DIR)
-	$(REMOVE)/$(NEUTRINO-MEDIATHEK_TMP)
+	$(REMOVE)/$(NEUTRINO-MEDIATHEK_DIR)
 	$(GET-GIT-SOURCE) $(NEUTRINO-MEDIATHEK_SITE)/$(NEUTRINO-MEDIATHEK_SOURCE) $(DL_DIR)/$(NEUTRINO-MEDIATHEK_SOURCE)
 	$(CPDIR)/$(NEUTRINO-MEDIATHEK_SOURCE)
-	$(CHDIR)/$(NEUTRINO-MEDIATHEK_TMP); \
+	$(CHDIR)/$(NEUTRINO-MEDIATHEK_DIR); \
 		$(INSTALL_COPY) plugins/* $(SHARE_PLUGINS)/; \
 		$(INSTALL_COPY) share $(TARGET_DIR)
-	$(REMOVE)/$(NEUTRINO-MEDIATHEK_TMP)
+	$(REMOVE)/$(NEUTRINO-MEDIATHEK_DIR)
 	# temporarily use beta-version from our board
 	rm -rf $(SHARE_PLUGINS)/neutrino-mediathek*
 	$(INSTALL_COPY) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-lua/plugins/mediathek/* $(SHARE_PLUGINS)/
@ -199,7 +199,7 @@ neutrino-mediathek: $(SHARE_PLUGINS) | $(TARGET_DIR)
 # -----------------------------------------------------------------------------
 LINKS_VER    = 2.20.2
-LINKS_TMP    = links-$(LINKS_VER)
+LINKS_DIR    = links-$(LINKS_VER)
 LINKS_SOURCE = links-$(LINKS_VER).tar.bz2
 LINKS_SITE   = http://links.twibright.com/download
@ -221,14 +221,14 @@ else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), h7))
 endif
 links: $(LINKS_DEPS) $(DL_DIR)/$(LINKS_SOURCE) $(SHARE_PLUGINS) | $(TARGET_DIR)
-	$(REMOVE)/$(LINKS_TMP)
+	$(REMOVE)/$(LINKS_DIR)
 	$(UNTAR)/$(LINKS_SOURCE)
-	$(CHDIR)/$(LINKS_TMP)/intl; \
+	$(CHDIR)/$(LINKS_DIR)/intl; \
 		sed -i -e 's|^T_SAVE_HTML_OPTIONS,.*|T_SAVE_HTML_OPTIONS, "HTML-Optionen speichern",|' german.lng; \
 		echo "english" > index.txt; \
 		echo "german" >> index.txt; \
 		./gen-intl
-	$(CHDIR)/$(LINKS_TMP); \
+	$(CHDIR)/$(LINKS_DIR); \
 		$(call apply_patches, $(LINKS_PATCH)); \
 		autoreconf -vfi; \
 		$(CONFIGURE) \
@ -250,7 +250,7 @@ links: $(LINKS_DEPS) $(DL_DIR)/$(LINKS_SOURCE) $(SHARE_PLUGINS) | $(TARGET_DIR)
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	mv -f $(TARGET_BIN_DIR)/links $(SHARE_PLUGINS)/links.so
 	$(INSTALL_COPY) $(TARGET_FILES)/links/* $(TARGET_DIR)/
-	$(REMOVE)/$(LINKS_TMP)
+	$(REMOVE)/$(LINKS_DIR)
 	$(TOUCH)
 # -----------------------------------------------------------------------------
--- a/make/target-blobs.mk
+++ b/make/target-blobs.mk
@ -176,27 +176,27 @@ vuplus-drivers: $(DL_DIR)/$(BOXMODEL-DRIVERS_SOURCE) | $(TARGET_DIR)
 # -----------------------------------------------------------------------------
 HD51-LIBGLES_VER    = 20191101
-HD51-LIBGLES_TMP    = $(EMPTY)
+HD51-LIBGLES_DIR    = $(EMPTY)
 HD51-LIBGLES_SOURCE = hd51-v3ddriver-$(HD51-LIBGLES_VER).zip
 HD51-LIBGLES_SITE   = http://downloads.mutant-digital.net/v3ddriver
 BRE2ZE4K-LIBGLES_VER    = 20191101
-BRE2ZE4K-LIBGLES_TMP    = $(EMPTY)
+BRE2ZE4K-LIBGLES_DIR    = $(EMPTY)
 BRE2ZE4K-LIBGLES_SOURCE = bre2ze4k-v3ddriver-$(BRE2ZE4K-LIBGLES_VER).zip
 BRE2ZE4K-LIBGLES_SITE   = http://downloads.mutant-digital.net/v3ddriver
 H7-LIBGLES_VER    = 20191110
-H7-LIBGLES_TMP    = $(EMPTY)
+H7-LIBGLES_DIR    = $(EMPTY)
 H7-LIBGLES_SOURCE = h7-v3ddriver-$(H7-LIBGLES_VER).zip
 H7-LIBGLES_SITE   = http://source.mynonpublic.com/zgemma
 HD60-LIBGLES_VER    = 20181201
-HD60-LIBGLES_TMP    = $(EMPTY)
+HD60-LIBGLES_DIR    = $(EMPTY)
 HD60-LIBGLES_SOURCE = hd60-mali-$(HD60-LIBGLES_VER).zip
 HD60-LIBGLES_SITE   = http://downloads.mutant-digital.net/hd60
 HD61-LIBGLES_VER    = 20181201
-HD61-LIBGLES_TMP    = $(EMPTY)
+HD61-LIBGLES_DIR    = $(EMPTY)
 HD61-LIBGLES_SOURCE = hd61-mali-$(HD61-LIBGLES_VER).zip
 HD61-LIBGLES_SITE   = http://downloads.mutant-digital.net/hd61
@ -204,44 +204,44 @@ HD6x-LIBGLES-HEADERS_SOURCE = libgles-mali-utgard-headers.zip
 HD6x-LIBGLES-HEADERS_SITE   = https://github.com/HD-Digital/meta-gfutures/raw/release-6.2/recipes-bsp/mali/files
 VUSOLO4K-LIBGLES_VER    = $(VUSOLO4K-DRIVERS_VER)
-VUSOLO4K-LIBGLES_TMP    = libgles-vusolo4k
+VUSOLO4K-LIBGLES_DIR    = libgles-vusolo4k
 VUSOLO4K-LIBGLES_SOURCE = libgles-vusolo4k-17.1-$(VUSOLO4K-LIBGLES_VER).r0.tar.gz
 VUSOLO4K-LIBGLES_SITE   = http://archive.vuplus.com/download/build_support/vuplus
 VUDUO4K-LIBGLES_VER    = $(VUDUO4K-DRIVERS_VER)
-VUDUO4K-LIBGLES_TMP    = libgles-vuduo4k
+VUDUO4K-LIBGLES_DIR    = libgles-vuduo4k
 VUDUO4K-LIBGLES_SOURCE = libgles-vuduo4k-18.1-$(VUDUO4K-LIBGLES_VER).r0.tar.gz
 VUDUO4K-LIBGLES_SITE   = http://archive.vuplus.com/download/build_support/vuplus
 VUDUO4KSE-LIBGLES_VER    = $(VUDUO4KSE-DRIVERS_VER)
-VUDUO4KSE-LIBGLES_TMP    = libgles-vuduo4kse
+VUDUO4KSE-LIBGLES_DIR    = libgles-vuduo4kse
 VUDUO4KSE-LIBGLES_SOURCE = libgles-vuduo4kse-17.1-$(VUDUO4KSE-LIBGLES_VER).r0.tar.gz
 VUDUO4KSE-LIBGLES_SITE   = http://archive.vuplus.com/download/build_support/vuplus
 VUULTIMO4K-LIBGLES_VER    = $(VUULTIMO4K-DRIVERS_VER)
-VUULTIMO4K-LIBGLES_TMP    = libgles-vuultimo4k
+VUULTIMO4K-LIBGLES_DIR    = libgles-vuultimo4k
 VUULTIMO4K-LIBGLES_SOURCE = libgles-vuultimo4k-17.1-$(VUULTIMO4K-LIBGLES_VER).r0.tar.gz
 VUULTIMO4K-LIBGLES_SITE   = http://archive.vuplus.com/download/build_support/vuplus
 VUZERO4K-LIBGLES_VER    = $(VUZERO4K-DRIVERS_VER)
-VUZERO4K-LIBGLES_TMP    = libgles-vuzero4k
+VUZERO4K-LIBGLES_DIR    = libgles-vuzero4k
 VUZERO4K-LIBGLES_SOURCE = libgles-vuzero4k-17.1-$(VUZERO4K-LIBGLES_VER).r0.tar.gz
 VUZERO4K-LIBGLES_SITE   = http://archive.vuplus.com/download/build_support/vuplus
 VUUNO4K-LIBGLES_VER    = $(VUUNO4K-DRIVERS_VER)
-VUUNO4K-LIBGLES_TMP    = libgles-vuuno4k
+VUUNO4K-LIBGLES_DIR    = libgles-vuuno4k
 VUUNO4K-LIBGLES_SOURCE = libgles-vuuno4k-17.1-$(VUUNO4K-LIBGLES_VER).r0.tar.gz
 VUUNO4K-LIBGLES_SITE   = http://archive.vuplus.com/download/build_support/vuplus
 VUUNO4KSE-LIBGLES_VER    = $(VUUNO4KSE-DRIVERS_VER)
-VUUNO4KSE-LIBGLES_TMP    = libgles-vuuno4kse
+VUUNO4KSE-LIBGLES_DIR    = libgles-vuuno4kse
 VUUNO4KSE-LIBGLES_SOURCE = libgles-vuuno4kse-17.1-$(VUUNO4KSE-LIBGLES_VER).r0.tar.gz
 VUUNO4KSE-LIBGLES_SITE   = http://archive.vuplus.com/download/build_support/vuplus
 # -----------------------------------------------------------------------------
 BOXMODEL-LIBGLES_VER    = $($(call UPPERCASE,$(BOXMODEL))-LIBGLES_VER)
-BOXMODEL-LIBGLES_TMP    = $($(call UPPERCASE,$(BOXMODEL))-LIBGLES_TMP)
+BOXMODEL-LIBGLES_DIR    = $($(call UPPERCASE,$(BOXMODEL))-LIBGLES_DIR)
 BOXMODEL-LIBGLES_SOURCE = $($(call UPPERCASE,$(BOXMODEL))-LIBGLES_SOURCE)
 BOXMODEL-LIBGLES_SITE   = $($(call UPPERCASE,$(BOXMODEL))-LIBGLES_SITE)
@ -285,31 +285,31 @@ vuzero4k-libgles \
 vuuno4k-libgles \
 vuuno4kse-libgles \
 vuplus-libgles: $(DL_DIR)/$(BOXMODEL-LIBGLES_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(BOXMODEL-LIBGLES_TMP)
+	$(REMOVE)/$(BOXMODEL-LIBGLES_DIR)
 	$(UNTAR)/$(BOXMODEL-LIBGLES_SOURCE)
-	$(INSTALL_EXEC) $(BUILD_DIR)/$(BOXMODEL-LIBGLES_TMP)/lib/* $(TARGET_LIB_DIR)
+	$(INSTALL_EXEC) $(BUILD_DIR)/$(BOXMODEL-LIBGLES_DIR)/lib/* $(TARGET_LIB_DIR)
 	ln -sf libv3ddriver.so $(TARGET_LIB_DIR)/libEGL.so
 	ln -sf libv3ddriver.so $(TARGET_LIB_DIR)/libGLESv2.so
-	$(INSTALL_COPY) $(BUILD_DIR)/$(BOXMODEL-LIBGLES_TMP)/include/* $(TARGET_INCLUDE_DIR)
+	$(INSTALL_COPY) $(BUILD_DIR)/$(BOXMODEL-LIBGLES_DIR)/include/* $(TARGET_INCLUDE_DIR)
-	$(REMOVE)/$(BOXMODEL-LIBGLES_TMP)
+	$(REMOVE)/$(BOXMODEL-LIBGLES_DIR)
 	$(TOUCH)
 # -----------------------------------------------------------------------------
 HD60-LIBS_VER    = 20200622
-HD60-LIBS_TMP    = hiplay
+HD60-LIBS_DIR    = hiplay
 HD60-LIBS_SOURCE = gfutures-libs-3798mv200-$(HD60-LIBS_VER).zip
 HD60-LIBS_SITE   = http://source.mynonpublic.com/gfutures
 HD61-LIBS_VER    = 20200622
-HD61-LIBS_TMP    = hiplay
+HD61-LIBS_DIR    = hiplay
 HD61-LIBS_SOURCE = gfutures-libs-3798mv200-$(HD61-LIBS_VER).zip
 HD61-LIBS_SITE   = http://source.mynonpublic.com/gfutures
 # -----------------------------------------------------------------------------
 BOXMODEL-LIBS_VER    = $($(call UPPERCASE,$(BOXMODEL))-LIBS_VER)
-BOXMODEL-LIBS_TMP    = $($(call UPPERCASE,$(BOXMODEL))-LIBS_TMP)
+BOXMODEL-LIBS_DIR    = $($(call UPPERCASE,$(BOXMODEL))-LIBS_DIR)
 BOXMODEL-LIBS_SOURCE = $($(call UPPERCASE,$(BOXMODEL))-LIBS_SOURCE)
 BOXMODEL-LIBS_SITE   = $($(call UPPERCASE,$(BOXMODEL))-LIBS_SITE)
@ -320,56 +320,56 @@ endif
 hd60-libs \
 hd61-libs: $(DL_DIR)/$(BOXMODEL-LIBS_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(BOXMODEL-LIBS_TMP)
+	$(REMOVE)/$(BOXMODEL-LIBS_DIR)
-	unzip -o $(DL_DIR)/$(BOXMODEL-LIBS_SOURCE) -d $(BUILD_DIR)/$(BOXMODEL-LIBS_TMP)
+	unzip -o $(DL_DIR)/$(BOXMODEL-LIBS_SOURCE) -d $(BUILD_DIR)/$(BOXMODEL-LIBS_DIR)
 	mkdir -p $(TARGET_USR_LIB_DIR)/hisilicon
-	$(INSTALL_EXEC) $(BUILD_DIR)/$(BOXMODEL-LIBS_TMP)/hisilicon/* $(TARGET_USR_LIB_DIR)/hisilicon
+	$(INSTALL_EXEC) $(BUILD_DIR)/$(BOXMODEL-LIBS_DIR)/hisilicon/* $(TARGET_USR_LIB_DIR)/hisilicon
-	$(INSTALL_EXEC) $(BUILD_DIR)/$(BOXMODEL-LIBS_TMP)/ffmpeg/* $(TARGET_USR_LIB_DIR)/hisilicon
+	$(INSTALL_EXEC) $(BUILD_DIR)/$(BOXMODEL-LIBS_DIR)/ffmpeg/* $(TARGET_USR_LIB_DIR)/hisilicon
 	ln -sf /lib/ld-linux-armhf.so.3 $(TARGET_USR_LIB_DIR)/hisilicon/ld-linux.so
-	$(REMOVE)/$(BOXMODEL-LIBS_TMP)
+	$(REMOVE)/$(BOXMODEL-LIBS_DIR)
 	$(TOUCH)
 # -----------------------------------------------------------------------------
 VUSOLO4K-PLATFORM-UTIL_VER    = $(VUSOLO4K-DRIVERS_VER)
-VUSOLO4K-PLATFORM-UTIL_TMP    = platform-util-vusolo4k
+VUSOLO4K-PLATFORM-UTIL_DIR    = platform-util-vusolo4k
 VUSOLO4K-PLATFORM-UTIL_SOURCE = platform-util-vusolo4k-17.1-$(VUSOLO4K-PLATFORM-UTIL_VER).r0.tar.gz
 VUSOLO4K-PLATFORM-UTIL_SITE   = http://archive.vuplus.com/download/build_support/vuplus
 VUDUO4K-PLATFORM-UTIL_VER    = $(VUDUO4K-DRIVERS_VER)
-VUDUO4K-PLATFORM-UTIL_TMP    = platform-util-vuduo4k
+VUDUO4K-PLATFORM-UTIL_DIR    = platform-util-vuduo4k
 VUDUO4K-PLATFORM-UTIL_SOURCE = platform-util-vuduo4k-18.1-$(VUDUO4K-PLATFORM-UTIL_VER).r0.tar.gz
 VUDUO4K-PLATFORM-UTIL_SITE   = http://archive.vuplus.com/download/build_support/vuplus
 VUDUO4KSE-PLATFORM-UTIL_VER    = $(VUDUO4KSE-DRIVERS_VER)
-VUDUO4KSE-PLATFORM-UTIL_TMP    = platform-util-vuduo4kse
+VUDUO4KSE-PLATFORM-UTIL_DIR    = platform-util-vuduo4kse
 VUDUO4KSE-PLATFORM-UTIL_SOURCE = platform-util-vuduo4kse-17.1-$(VUDUO4KSE-PLATFORM-UTIL_VER).r0.tar.gz
 VUDUO4KSE-PLATFORM-UTIL_SITE   = http://archive.vuplus.com/download/build_support/vuplus
 VUULTIMO4K-PLATFORM-UTIL_VER    = $(VUULTIMO4K-DRIVERS_VER)
-VUULTIMO4K-PLATFORM-UTIL_TMP    = platform-util-vuultimo4k
+VUULTIMO4K-PLATFORM-UTIL_DIR    = platform-util-vuultimo4k
 VUULTIMO4K-PLATFORM-UTIL_SOURCE = platform-util-vuultimo4k-17.1-$(VUULTIMO4K-PLATFORM-UTIL_VER).r0.tar.gz
 VUULTIMO4K-PLATFORM-UTIL_SITE   = http://archive.vuplus.com/download/build_support/vuplus
 VUZERO4K-PLATFORM-UTIL_VER    = $(VUZERO4K-DRIVERS_VER)
-VUZERO4K-PLATFORM-UTIL_TMP    = platform-util-vuzero4k
+VUZERO4K-PLATFORM-UTIL_DIR    = platform-util-vuzero4k
 VUZERO4K-PLATFORM-UTIL_SOURCE = platform-util-vuzero4k-17.1-$(VUZERO4K-PLATFORM-UTIL_VER).r0.tar.gz
 VUZERO4K-PLATFORM-UTIL_SITE   = http://archive.vuplus.com/download/build_support/vuplus
 VUUNO4K-PLATFORM-UTIL_VER    = $(VUUNO4K-DRIVERS_VER)
-VUUNO4K-PLATFORM-UTIL_TMP    = platform-util-vuuno4k
+VUUNO4K-PLATFORM-UTIL_DIR    = platform-util-vuuno4k
 VUUNO4K-PLATFORM-UTIL_SOURCE = platform-util-vuuno4k-17.1-$(VUUNO4K-PLATFORM-UTIL_VER).r0.tar.gz
 VUUNO4K-PLATFORM-UTIL_SITE   = http://archive.vuplus.com/download/build_support/vuplus
 VUUNO4KSE-PLATFORM-UTIL_VER    = $(VUUNO4KSE-DRIVERS_VER)
-VUUNO4KSE-PLATFORM-UTIL_TMP    = platform-util-vuuno4kse
+VUUNO4KSE-PLATFORM-UTIL_DIR    = platform-util-vuuno4kse
 VUUNO4KSE-PLATFORM-UTIL_SOURCE = platform-util-vuuno4kse-17.1-$(VUUNO4KSE-PLATFORM-UTIL_VER).r0.tar.gz
 VUUNO4KSE-PLATFORM-UTIL_SITE   = http://archive.vuplus.com/download/build_support/vuplus
 # -----------------------------------------------------------------------------
 BOXMODEL-PLATFORM-UTIL_VER    = $($(call UPPERCASE,$(BOXMODEL))-PLATFORM-UTIL_VER)
-BOXMODEL-PLATFORM-UTIL_TMP    = $($(call UPPERCASE,$(BOXMODEL))-PLATFORM-UTIL_TMP)
+BOXMODEL-PLATFORM-UTIL_DIR    = $($(call UPPERCASE,$(BOXMODEL))-PLATFORM-UTIL_DIR)
 BOXMODEL-PLATFORM-UTIL_SOURCE = $($(call UPPERCASE,$(BOXMODEL))-PLATFORM-UTIL_SOURCE)
 BOXMODEL-PLATFORM-UTIL_SITE   = $($(call UPPERCASE,$(BOXMODEL))-PLATFORM-UTIL_SITE)
@ -379,12 +379,12 @@ $(DL_DIR)/$(BOXMODEL-PLATFORM-UTIL_SOURCE):
 endif
 vuplus-platform-util: $(DL_DIR)/$(BOXMODEL-PLATFORM-UTIL_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(BOXMODEL-PLATFORM-UTIL_TMP)
+	$(REMOVE)/$(BOXMODEL-PLATFORM-UTIL_DIR)
 	$(UNTAR)/$(BOXMODEL-PLATFORM-UTIL_SOURCE)
-	$(INSTALL_EXEC) -D $(BUILD_DIR)/$(BOXMODEL-PLATFORM-UTIL_TMP)/* $(TARGET_USR_BIN_DIR)
+	$(INSTALL_EXEC) -D $(BUILD_DIR)/$(BOXMODEL-PLATFORM-UTIL_DIR)/* $(TARGET_USR_BIN_DIR)
 	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/vuplus-platform-util.init $(TARGET_DIR)/etc/init.d/vuplus-platform-util
 ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vuduo4k))
 	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/bp3flash.sh $(TARGET_USR_BIN_DIR)/bp3flash.sh
 endif
-	$(REMOVE)/$(BOXMODEL-PLATFORM-UTIL_TMP)
+	$(REMOVE)/$(BOXMODEL-PLATFORM-UTIL_DIR)
 	$(TOUCH)
--- a/make/target-development.mk
+++ b/make/target-development.mk
@ -11,7 +11,7 @@ valgrind: $(VALGRIND_TARGET)
 # -----------------------------------------------------------------------------
 VALGRIND_VER    = 3.13.0
-VALGRIND_TMP    = valgrind-$(VALGRIND_VER)
+VALGRIND_DIR    = valgrind-$(VALGRIND_VER)
 VALGRIND_SOURCE = valgrind-$(VALGRIND_VER).tar.bz2
 VALGRIND_SITE   = ftp://sourceware.org/pub/valgrind
@ -21,9 +21,9 @@ $(DL_DIR)/$(VALGRIND_SOURCE):
 VALGRIND_PATCH  = valgrind-fix-build-$(TARGET_ARCH).patch
 valgrind3: $(DL_DIR)/$(VALGRIND_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(VALGRIND_TMP)
+	$(REMOVE)/$(VALGRIND_DIR)
 	$(UNTAR)/$(VALGRIND_SOURCE)
-	$(CHDIR)/$(VALGRIND_TMP); \
+	$(CHDIR)/$(VALGRIND_DIR); \
 		$(call apply_patches, $(VALGRIND_PATCH)); \
 		export AR=$(TARGET_AR); \
 		autoreconf -fi; \
@ -38,7 +38,7 @@ valgrind3: $(DL_DIR)/$(VALGRIND_SOURCE) | $(TARGET_DIR)
 	$(REWRITE_PKGCONF_PC)
 	rm -f $(addprefix $(TARGET_LIB_DIR)/valgrind/,*.a *.xml)
 	rm -f $(addprefix $(TARGET_BIN_DIR)/,cg_* callgrind_* ms_print)
-	$(REMOVE)/$(VALGRIND_TMP)
+	$(REMOVE)/$(VALGRIND_DIR)
 	$(TOUCH)
 # -----------------------------------------------------------------------------
@ -68,7 +68,7 @@ valgrind12305: | $(TARGET_DIR)
 # -----------------------------------------------------------------------------
 STRACE_VER    = 5.1
-STRACE_TMP    = strace-$(STRACE_VER)
+STRACE_DIR    = strace-$(STRACE_VER)
 STRACE_SOURCE = strace-$(STRACE_VER).tar.xz
 STRACE_SITE   = https://strace.io/files/$(STRACE_VER)
@ -76,9 +76,9 @@ $(DL_DIR)/$(STRACE_SOURCE):
 	$(DOWNLOAD) $(STRACE_SITE)/$(STRACE_SOURCE)
 strace: $(DL_DIR)/$(STRACE_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(STRACE_TMP)
+	$(REMOVE)/$(STRACE_DIR)
 	$(UNTAR)/$(STRACE_SOURCE)
-	$(CHDIR)/$(STRACE_TMP); \
+	$(CHDIR)/$(STRACE_DIR); \
 		$(CONFIGURE) \
 			--prefix= \
 			--mandir=$(remove-mandir) \
@ -87,13 +87,13 @@ strace: $(DL_DIR)/$(STRACE_SOURCE) | $(TARGET_DIR)
 		$(MAKE) all; \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	rm -f $(addprefix $(TARGET_BIN_DIR)/,strace-graph strace-log-merge)
-	$(REMOVE)/$(STRACE_TMP)
+	$(REMOVE)/$(STRACE_DIR)
 	$(TOUCH)
 # -----------------------------------------------------------------------------
 GDB_VER    = 8.3
-GDB_TMP    = gdb-$(GDB_VER)
+GDB_DIR    = gdb-$(GDB_VER)
 GDB_SOURCE = gdb-$(GDB_VER).tar.xz
 GDB_SITE   = https://sourceware.org/pub/gdb/releases
@ -103,9 +103,9 @@ $(DL_DIR)/$(GDB_SOURCE):
 GDB_DEPS   = zlib ncurses
 gdb: $(GDB_DEPS) $(DL_DIR)/$(GDB_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(GDB_TMP)
+	$(REMOVE)/$(GDB_DIR)
 	$(UNTAR)/$(GDB_SOURCE)
-	$(CHDIR)/$(GDB_TMP); \
+	$(CHDIR)/$(GDB_DIR); \
 		$(CONFIGURE) \
 			--prefix= \
 			--mandir=$(remove-mandir) \
@ -127,5 +127,5 @@ gdb: $(GDB_DEPS) $(DL_DIR)/$(GDB_SOURCE) | $(TARGET_DIR)
 		$(MAKE) install-gdb DESTDIR=$(TARGET_DIR)
 	rm -rf $(addprefix $(TARGET_SHARE_DIR)/,system-gdbinit)
 	find $(TARGET_SHARE_DIR)/gdb/syscalls -type f -not -name 'arm-linux.xml' -not -name 'gdb-syscalls.dtd' -print0 | xargs -0 rm --
-	$(REMOVE)/$(GDB_TMP)
+	$(REMOVE)/$(GDB_DIR)
 	$(TOUCH)
--- a/make/target-ffmpeg.mk
+++ b/make/target-ffmpeg.mk
@ -4,7 +4,7 @@
 # -----------------------------------------------------------------------------
 FFMPEG_VER    = 4.3
-FFMPEG_TMP    = ffmpeg-$(FFMPEG_VER)
+FFMPEG_DIR    = ffmpeg-$(FFMPEG_VER)
 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VER).tar.xz
 FFMPEG_SITE   = http://www.ffmpeg.org/releases
@ -343,13 +343,13 @@ endif
 # -----------------------------------------------------------------------------
 ffmpeg: $(FFMPEG_DEPS) $(DL_DIR)/$(FFMPEG_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(FFMPEG_TMP)
+	$(REMOVE)/$(FFMPEG_DIR)
 	$(UNTAR)/$(FFMPEG_SOURCE)
 ifneq ($(FFMPEG_UNPATCHED), yes)
-	$(CHDIR)/$(FFMPEG_TMP); \
+	$(CHDIR)/$(FFMPEG_DIR); \
 		$(APPLY_PATCHES)
 endif
-	$(CHDIR)/$(FFMPEG_TMP); \
+	$(CHDIR)/$(FFMPEG_DIR); \
 		./configure \
 			$(FFMPEG_CONFIGURE_GENERIC) \
 			$(FFMPEG_CONFIGURE_PLATFORM) \
@ -357,5 +357,5 @@ endif
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF_PC)
-	$(REMOVE)/$(FFMPEG_TMP)
+	$(REMOVE)/$(FFMPEG_DIR)
 	$(TOUCH)
--- a/make/target-libs-static.mk
+++ b/make/target-libs-static.mk
@ -13,7 +13,7 @@ libs-static: $(LIBS-STATIC)
 # -----------------------------------------------------------------------------
 CORTEX-STRINGS_VER    = 48fd30c
-CORTEX-STRINGS_TMP    = cortex-strings-$(CORTEX-STRINGS_VER)
+CORTEX-STRINGS_DIR    = cortex-strings-$(CORTEX-STRINGS_VER)
 CORTEX-STRINGS_SOURCE = cortex-strings-$(CORTEX-STRINGS_VER).tar.bz2
 CORTEX-STRINGS_SITE   = http://git.linaro.org/git-ro/toolchain/cortex-strings.git
@ -24,9 +24,9 @@ CORTEX-STRINGS_CONF   = $(if $(filter $(BOXSERIES), hd5x hd6x vusolo4k vuduo4k v
 cortex-strings: $(STATIC_LIB_DIR)/libcortex-strings.la
 $(STATIC_LIB_DIR)/libcortex-strings.la: $(DL_DIR)/$(CORTEX-STRINGS_SOURCE) | $(STATIC_DIR)
-	$(REMOVE)/$(CORTEX-STRINGS_TMP)
+	$(REMOVE)/$(CORTEX-STRINGS_DIR)
 	$(UNTAR)/$(CORTEX-STRINGS_SOURCE)
-	$(CHDIR)/$(CORTEX-STRINGS_TMP); \
+	$(CHDIR)/$(CORTEX-STRINGS_DIR); \
 		./autogen.sh; \
 		CFLAGS="-pipe -O2 $(TARGET_DEBUGGING) $(CXX11_ABI) -I$(TARGET_INCLUDE_DIR)" \
 		CPPFLAGS="-pipe -O2 $(TARGET_DEBUGGING) $(CXX11_ABI) -I$(TARGET_INCLUDE_DIR)" \
@ -42,7 +42,7 @@ $(STATIC_LIB_DIR)/libcortex-strings.la: $(DL_DIR)/$(CORTEX-STRINGS_SOURCE) | $(S
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(STATIC_DIR)
 	$(REWRITE_LIBTOOL_STATIC)/libcortex-strings.la
-	$(REMOVE)/$(CORTEX-STRINGS_TMP)
+	$(REMOVE)/$(CORTEX-STRINGS_DIR)
 # -----------------------------------------------------------------------------
--- a/make/target-libs-unused.mk
+++ b/make/target-libs-unused.mk
@ -4,7 +4,7 @@
 # -----------------------------------------------------------------------------
 LIBID3TAG_VER    = 0.15.1b
-LIBID3TAG_TMP    = libid3tag-$(LIBID3TAG_VER)
+LIBID3TAG_DIR    = libid3tag-$(LIBID3TAG_VER)
 LIBID3TAG_SOURCE = libid3tag-$(LIBID3TAG_VER).tar.gz
 LIBID3TAG_SITE   = https://sourceforge.net/projects/mad/files/libid3tag/$(LIBID3TAG_VER)
@ -16,9 +16,9 @@ LIBID3TAG_PATCH  = libid3tag-pc.patch
 LIBID3TAG_DEPS   = zlib
 libid3tag: $(LIBID3TAG_DEPS) $(DL_DIR)/$(LIBID3TAG_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(LIBID3TAG_TMP)
+	$(REMOVE)/$(LIBID3TAG_DIR)
 	$(UNTAR)/$(LIBID3TAG_SOURCE)
-	$(CHDIR)/$(LIBID3TAG_TMP); \
+	$(CHDIR)/$(LIBID3TAG_DIR); \
 		$(call apply_patches, $(LIBID3TAG_PATCH)); \
 		autoreconf -fi; \
 		$(CONFIGURE) \
@ -29,13 +29,13 @@ libid3tag: $(LIBID3TAG_DEPS) $(DL_DIR)/$(LIBID3TAG_SOURCE) | $(TARGET_DIR)
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_LIBTOOL_LA)
 	$(REWRITE_PKGCONF_PC)
-	$(REMOVE)/$(LIBID3TAG_TMP)
+	$(REMOVE)/$(LIBID3TAG_DIR)
 	$(TOUCH)
 # -----------------------------------------------------------------------------
 FLAC_VER    = 1.3.2
-FLAC_TMP    = flac-$(FLAC_VER)
+FLAC_DIR    = flac-$(FLAC_VER)
 FLAC_SOURCE = flac-$(FLAC_VER).tar.xz
 FLAC_SITE   = https://ftp.osuosl.org/pub/xiph/releases/flac
@ -43,9 +43,9 @@ $(DL_DIR)/$(FLAC_SOURCE):
 	$(DOWNLOAD) $(FLAC_SITE)/$(FLAC_SOURCE)
 libFLAC: $(DL_DIR)/$(FLAC_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(LIBFLAC_TMP)
+	$(REMOVE)/$(LIBFLAC_DIR)
 	$(UNTAR)/$(LIBFLAC_SOURCE)
-	$(CHDIR)/$(LIBFLAC_TMP); \
+	$(CHDIR)/$(LIBFLAC_DIR); \
 		autoreconf -fi; \
 		$(CONFIGURE) \
 			--prefix= \
@ -63,13 +63,13 @@ libFLAC: $(DL_DIR)/$(FLAC_SOURCE) | $(TARGET_DIR)
 	$(REWRITE_PKGCONF_PC)
 	rm -rf $(TARGET_DIR)/bin/flac
 	rm -rf $(TARGET_DIR)/bin/metaflac
-	$(REMOVE)/$(LIBFLAC_TMP)
+	$(REMOVE)/$(LIBFLAC_DIR)
 	$(TOUCH)
 # -----------------------------------------------------------------------------
 BZIP2_VER    = 1.0.8
-BZIP2_TMP    = bzip2-$(BZIP2_VER)
+BZIP2_DIR    = bzip2-$(BZIP2_VER)
 BZIP2_SOURCE = bzip2-$(BZIP2_VER).tar.gz
 BZIP2_SITE   = https://sourceware.org/pub/bzip2
@ -79,22 +79,22 @@ $(DL_DIR)/$(BZIP2_SOURCE):
 BZIP2_PATCH  = bzip2.patch
 bzip2: $(DL_DIR)/$(BZIP2_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(BZIP2_TMP)
+	$(REMOVE)/$(BZIP2_DIR)
 	$(UNTAR)/$(BZIP2_SOURCE)
-	$(CHDIR)/$(BZIP2_TMP); \
+	$(CHDIR)/$(BZIP2_DIR); \
 		$(call apply_patches, $(BZIP2_PATCH)); \
 		mv Makefile-libbz2_so Makefile; \
 		$(MAKE_ENV) \
 		$(MAKE) all; \
 		$(MAKE) install PREFIX=$(TARGET_DIR)
 	rm -f $(TARGET_DIR)/bin/bzip2
-	$(REMOVE)/$(BZIP2_TMP)
+	$(REMOVE)/$(BZIP2_DIR)
 	$(TOUCH)
 # -----------------------------------------------------------------------------
 FONTCONFIG_VER    = 2.11.93
-FONTCONFIG_TMP    = fontconfig-$(FONTCONFIG_VER)
+FONTCONFIG_DIR    = fontconfig-$(FONTCONFIG_VER)
 FONTCONFIG_SOURCE = fontconfig-$(FONTCONFIG_VER).tar.bz2
 FONTCONFIG_SITE   = https://www.freedesktop.org/software/fontconfig/release
@ -104,9 +104,9 @@ $(DL_DIR)/$(FONTCONFIG_SOURCE):
 FONTCONFIG_DEPS   = freetype expat
 fontconfig: $(FONTCONFIG_DEPS) $(DL_DIR)/$(FONTCONFIG_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(FONTCONFIG_TMP)
+	$(REMOVE)/$(FONTCONFIG_DIR)
 	$(UNTAR)/$(FONTCONFIG_SOURCE)
-	$(CHDIR)/$(FONTCONFIG_TMP); \
+	$(CHDIR)/$(FONTCONFIG_DIR); \
 		$(CONFIGURE) \
 			--prefix= \
 			--with-freetype-config=$(HOST_DIR)/bin/freetype-config \
@ -119,13 +119,13 @@ fontconfig: $(FONTCONFIG_DEPS) $(DL_DIR)/$(FONTCONFIG_SOURCE) | $(TARGET_DIR)
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_LIBTOOL_LA)
 	$(REWRITE_PKGCONF_PC)
-	$(REMOVE)/$(FONTCONFIG_TMP)
+	$(REMOVE)/$(FONTCONFIG_DIR)
 	$(TOUCH)
 # -----------------------------------------------------------------------------
 PIXMAN_VER    = 0.34.0
-PIXMAN_TMP    = pixman-$(PIXMAN_VER)
+PIXMAN_DIR    = pixman-$(PIXMAN_VER)
 PIXMAN_SOURCE = pixman-$(PIXMAN_VER).tar.gz
 PIXMAN_SITE   = https://www.cairographics.org/releases
@ -139,9 +139,9 @@ PIXMAN_PATCH += pixman-0001-test-utils-Check-for-FE_INVALID-definition-before-us
 PIXMAN_DEPS   = zlib libpng
 pixman: $(PIXMAN_DEPS) $(DL_DIR)/$(PIXMAN_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(PIXMAN_TMP)
+	$(REMOVE)/$(PIXMAN_DIR)
 	$(UNTAR)/$(PIXMAN_SOURCE)
-	$(CHDIR)/$(PIXMAN_TMP); \
+	$(CHDIR)/$(PIXMAN_DIR); \
 		$(call apply_patches, $(PIXMAN_PATCH)); \
 		$(CONFIGURE) \
 			--prefix= \
@ -154,13 +154,13 @@ pixman: $(PIXMAN_DEPS) $(DL_DIR)/$(PIXMAN_SOURCE) | $(TARGET_DIR)
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_LIBTOOL_LA)
 	$(REWRITE_PKGCONF_PC)
-	$(REMOVE)/$(PIXMAN_TMP)
+	$(REMOVE)/$(PIXMAN_DIR)
 	$(TOUCH)
 # -----------------------------------------------------------------------------
 CAIRO_VER    = 1.16.0
-CAIRO_TMP    = cairo-$(CAIRO_VER)
+CAIRO_DIR    = cairo-$(CAIRO_VER)
 CAIRO_SOURCE = cairo-$(CAIRO_VER).tar.xz
 CAIRO_SITE   = https://www.cairographics.org/releases
@ -172,9 +172,9 @@ CAIRO_PATCH  = cairo-get_bitmap_surface.diff
 CAIRO_DEPS   = fontconfig glib2 libpng pixman zlib
 cairo: $(CAIRO_DEPS) $(DL_DIR)/$(CAIRO_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(CAIRO_TMP)
+	$(REMOVE)/$(CAIRO_DIR)
 	$(UNTAR)/$(CAIRO_SOURCE)
-	$(CHDIR)/$(CAIRO_TMP); \
+	$(CHDIR)/$(CAIRO_DIR); \
 		$(call apply_patches, $(CAIRO_PATCH)); \
 		$(MAKE_ENV) \
 		ax_cv_c_float_words_bigendian="no" \
@ -197,13 +197,13 @@ cairo: $(CAIRO_DEPS) $(DL_DIR)/$(CAIRO_SOURCE) | $(TARGET_DIR)
 	rm -rf $(TARGET_LIB_DIR)/cairo/.debug/cairo-sphinx*
 	$(REWRITE_LIBTOOL_LA)
 	$(REWRITE_PKGCONF_PC)
-	$(REMOVE)/$(CAIRO_TMP)
+	$(REMOVE)/$(CAIRO_DIR)
 	$(TOUCH)
 # -----------------------------------------------------------------------------
 HARFBUZZ_VER    = 1.8.8
-HARFBUZZ_TMP    = harfbuzz-$(HARFBUZZ_VER)
+HARFBUZZ_DIR    = harfbuzz-$(HARFBUZZ_VER)
 HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VER).tar.bz2
 HARFBUZZ_SITE   = https://www.freedesktop.org/software/harfbuzz/release
@ -215,9 +215,9 @@ HARFBUZZ_PATCH  = harfbuzz-disable-docs.patch
 HARFBUZZ_DEPS   = fontconfig glib2 cairo freetype
 harfbuzz: $(HARFBUZZ_DEPS) $(DL_DIR)/$(HARFBUZZ_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(HARFBUZZ_TMP)
+	$(REMOVE)/$(HARFBUZZ_DIR)
 	$(UNTAR)/$(HARFBUZZ_SOURCE)
-	$(CHDIR)/$(HARFBUZZ_TMP); \
+	$(CHDIR)/$(HARFBUZZ_DIR); \
 		$(call apply_patches, $(HARFBUZZ_PATCH)); \
 		autoreconf -fi; \
 		$(CONFIGURE) \
@ -233,5 +233,5 @@ harfbuzz: $(HARFBUZZ_DEPS) $(DL_DIR)/$(HARFBUZZ_SOURCE) | $(TARGET_DIR)
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_LIBTOOL_LA)
 	$(REWRITE_PKGCONF_PC)
-	$(REMOVE)/$(HARFBUZZ_TMP)
+	$(REMOVE)/$(HARFBUZZ_DIR)
 	$(TOUCH)
--- a/make/target-libs.mk
+++ b/make/target-libs.mk
--- a/make/target-lua.mk
+++ b/make/target-lua.mk
@ -5,7 +5,7 @@
 LUA_ABIVER = 5.2
 LUA_VER    = 5.2.4
-LUA_TMP    = lua-$(LUA_VER)
+LUA_DIR    = lua-$(LUA_VER)
 LUA_SOURCE = lua-$(LUA_VER).tar.gz
 LUA_SITE   = https://www.lua.org
@ -21,9 +21,9 @@ LUA_PATCH += lua-04-crashfix.diff
 LUA_DEPS   = ncurses
 lua: $(LUA_DEPS) $(DL_DIR)/$(LUA_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(LUA_TMP)
+	$(REMOVE)/$(LUA_DIR)
 	$(UNTAR)/$(LUA_SOURCE)
-	$(CHDIR)/$(LUA_TMP); \
+	$(CHDIR)/$(LUA_DIR); \
 		$(call apply_patches, $(LUA_PATCH)); \
 		$(MAKE) linux \
 			PKG_VERSION=$(LUA_VER) \
@ -35,13 +35,13 @@ lua: $(LUA_DEPS) $(DL_DIR)/$(LUA_SOURCE) | $(TARGET_DIR)
 		$(MAKE) pc INSTALL_TOP=$(TARGET_DIR) > $(PKG_CONFIG_PATH)/lua.pc
 	$(REWRITE_PKGCONF_PC)
 	rm -rf $(TARGET_DIR)/bin/luac
-	$(REMOVE)/$(LUA_TMP)
+	$(REMOVE)/$(LUA_DIR)
 	$(TOUCH)
 # -----------------------------------------------------------------------------
 LUAEXPAT_VER    = 1.3.3
-LUAEXPAT_TMP    = luaexpat-$(LUAEXPAT_VER)
+LUAEXPAT_DIR    = luaexpat-$(LUAEXPAT_VER)
 LUAEXPAT_SOURCE = luaexpat-$(LUAEXPAT_VER).tar.gz
 LUAEXPAT_SITE   = https://github.com/tomasguisasola/luaexpat/archive
@ -51,9 +51,9 @@ $(DL_DIR)/$(LUAEXPAT_SOURCE):
 LUAEXPAT_DEPS   = expat lua
 luaexpat: $(LUAEXPAT_DEPS) $(DL_DIR)/$(LUAEXPAT_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(LUAEXPAT_TMP)
+	$(REMOVE)/$(LUAEXPAT_DIR)
 	$(UNTAR)/$(LUAEXPAT_SOURCE)
-	$(CHDIR)/$(LUAEXPAT_TMP); \
+	$(CHDIR)/$(LUAEXPAT_DIR); \
 		sed -i 's|^EXPAT_INC=.*|EXPAT_INC= $(TARGET_INCLUDE_DIR)|' makefile; \
 		sed -i 's|^CFLAGS =.*|& -L$(TARGET_LIB_DIR)|' makefile; \
 		sed -i 's|^CC =.*|CC = $(TARGET_CC)|' makefile; \
@ -64,13 +64,13 @@ luaexpat: $(LUAEXPAT_DEPS) $(DL_DIR)/$(LUAEXPAT_SOURCE) | $(TARGET_DIR)
 		$(MAKE) install \
 			PREFIX=$(TARGET_DIR) \
 			LUA_SYS_VER=$(LUA_ABIVER)
-	$(REMOVE)/$(LUAEXPAT_TMP)
+	$(REMOVE)/$(LUAEXPAT_DIR)
 	$(TOUCH)
 # -----------------------------------------------------------------------------
 LUA-FEEDPARSER_VER    = 0.71
-LUA-FEEDPARSER_TMP    = lua-feedparser-$(LUA-FEEDPARSER_VER)
+LUA-FEEDPARSER_DIR    = lua-feedparser-$(LUA-FEEDPARSER_VER)
 LUA-FEEDPARSER_SOURCE = lua-feedparser-$(LUA-FEEDPARSER_VER).tar.gz
 LUA-FEEDPARSER_SITE   = https://github.com/slact/lua-feedparser/archive
@ -82,13 +82,13 @@ LUA-FEEDPARSER_PATCH  = lua-feedparser.patch
 LUA-DEEDPARSER_DEPS   = luaexpat
 lua-feedparser: $(LUA-DEEDPARSER_DEPS) $(DL_DIR)/$(LUA-FEEDPARSER_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(LUA-FEEDPARSER_TMP)
+	$(REMOVE)/$(LUA-FEEDPARSER_DIR)
 	$(UNTAR)/$(LUA-FEEDPARSER_SOURCE)
-	$(CHDIR)/$(LUA-FEEDPARSER_TMP); \
+	$(CHDIR)/$(LUA-FEEDPARSER_DIR); \
 		sed -i 's|^PREFIX =|PREFIX ?=|' Makefile; \
 		$(call apply_patches, $(LUA-FEEDPARSER_PATCH)); \
 		$(MAKE) install PREFIX=$(TARGET_DIR)
-	$(REMOVE)/$(LUA-FEEDPARSER_TMP)
+	$(REMOVE)/$(LUA-FEEDPARSER_DIR)
 	$(TOUCH)
 # -----------------------------------------------------------------------------
@ -109,17 +109,17 @@ luajson: $(DL_DIR)/$(LUAJSON_SOURCE) | $(TARGET_DIR)
 # -----------------------------------------------------------------------------
 LUACURL_VER    = git
-LUACURL_TMP    = lua-curlv3.$(LUACURL_VER)
+LUACURL_DIR    = lua-curlv3.$(LUACURL_VER)
 LUACURL_SOURCE = lua-curlv3.$(LUACURL_VER)
 LUACURL_SITE   = https://github.com/lua-curl/$(LUACURL_SOURCE)
 LUACURL_DEPS   = libcurl lua
 luacurl: $(LUACURL_DEPS) | $(TARGET_DIR)
-	$(REMOVE)/$(LUACURL_TMP)
+	$(REMOVE)/$(LUACURL_DIR)
 	$(GET-GIT-SOURCE) $(LUACURL_SITE) $(DL_DIR)/$(LUACURL_SOURCE)
 	$(CPDIR)/$(LUACURL_SOURCE)
-	$(CHDIR)/$(LUACURL_TMP); \
+	$(CHDIR)/$(LUACURL_DIR); \
 		$(MAKE_ENV) \
 		$(MAKE) \
 			LIBDIR=$(TARGET_LIB_DIR) \
@ -127,13 +127,13 @@ luacurl: $(LUACURL_DEPS) | $(TARGET_DIR)
 		$(MAKE) install DESTDIR=$(TARGET_DIR) \
 			LUA_CMOD=/lib/lua/$(LUA_ABIVER) \
 			LUA_LMOD=/share/lua/$(LUA_ABIVER)
-	$(REMOVE)/$(LUACURL_TMP)
+	$(REMOVE)/$(LUACURL_DIR)
 	$(TOUCH)
 # -----------------------------------------------------------------------------
 LUAPOSIX_VER    = 31
-LUAPOSIX_TMP    = luaposix-$(LUAPOSIX_VER)
+LUAPOSIX_DIR    = luaposix-$(LUAPOSIX_VER)
 LUAPOSIX_SOURCE = luaposix-$(LUAPOSIX_VER).tar.gz
 LUAPOSIX_SITE   = https://github.com/luaposix/luaposix/archive
@ -160,9 +160,9 @@ $(DL_DIR)/$(SLINGSHOT_SOURCE):
 	$(DOWNLOAD) $(SLINGSHOT_SITE)/v$(SLINGSHOT_VER).tar.gz -O $(@)
 luaposix: $(LUAPOSIX_DEPS) $(DL_DIR)/$(SLINGSHOT_SOURCE) $(DL_DIR)/$(GNULIB_SOURCE) $(DL_DIR)/$(LUAPOSIX_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(LUAPOSIX_TMP)
+	$(REMOVE)/$(LUAPOSIX_DIR)
 	$(UNTAR)/$(LUAPOSIX_SOURCE)
-	$(CHDIR)/$(LUAPOSIX_TMP); \
+	$(CHDIR)/$(LUAPOSIX_DIR); \
 		tar -C gnulib --strip=1 -xf $(DL_DIR)/$(GNULIB_SOURCE); \
 		tar -C slingshot --strip=1 -xf $(DL_DIR)/$(SLINGSHOT_SOURCE); \
 		$(call apply_patches, $(LUAPOSIX_PATCH)); \
@ -180,5 +180,5 @@ luaposix: $(LUAPOSIX_DEPS) $(DL_DIR)/$(SLINGSHOT_SOURCE) $(DL_DIR)/$(GNULIB_SOUR
 			; \
 		$(MAKE); \
 		$(MAKE) all check install
-	$(REMOVE)/$(LUAPOSIX_TMP)
+	$(REMOVE)/$(LUAPOSIX_DIR)
 	$(TOUCH)
--- a/make/target-tools-unused.mk
+++ b/make/target-tools-unused.mk
@ -5,7 +5,7 @@
 # usbutils-008 needs udev
 USBUTILS_VER    = 007
-USBUTILS_TMP    = usbutils-$(USBUTILS_VER)
+USBUTILS_DIR    = usbutils-$(USBUTILS_VER)
 USBUTILS_SOURCE = usbutils-$(USBUTILS_VER).tar.xz
 USBUTILS_SITE   = https://www.kernel.org/pub/linux/utils/usb/usbutils
@ -18,9 +18,9 @@ USBUTILS_PATCH += usbutils-fix-null-pointer-crash.patch
 USBUTILS_DEPS   = libusb-compat
 usbutils: $(USBUTILS_DEPS) $(DL_DIR)/$(USBUTILS_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(USBUTILS_TMP)
+	$(REMOVE)/$(USBUTILS_DIR)
 	$(UNTAR)/$(USBUTILS_SOURCE)
-	$(CHDIR)/$(USBUTILS_TMP); \
+	$(CHDIR)/$(USBUTILS_DIR); \
 		$(call apply_patches, $(USBUTILS_PATCH)); \
 		$(CONFIGURE) \
 			--target=$(TARGET) \
@ -35,13 +35,13 @@ usbutils: $(USBUTILS_DEPS) $(DL_DIR)/$(USBUTILS_SOURCE) | $(TARGET_DIR)
 	rm -rf $(TARGET_DIR)/sbin/update-usbids.sh
 	rm -rf $(TARGET_SHARE_DIR)/pkgconfig
 	rm -rf $(TARGET_SHARE_DIR)/usb.ids.gz
-	$(REMOVE)/$(USBUTILS_TMP)
+	$(REMOVE)/$(USBUTILS_DIR)
 	$(TOUCH)
 # -----------------------------------------------------------------------------
 BINUTILS_VER    = 2.35
-BINUTILS_TMP    = binutils-$(BINUTILS_VER)
+BINUTILS_DIR    = binutils-$(BINUTILS_VER)
 BINUTILS_SOURCE = binutils-$(BINUTILS_VER).tar.bz2
 BINUTILS_SITE   = https://ftp.gnu.org/gnu/binutils
@ -51,9 +51,9 @@ $(DL_DIR)/$(BINUTILS_SOURCE):
 BINUTILS_BIN    = objdump objcopy
 binutils: $(DL_DIR)/$(BINUTILS_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(BINUTILS_TMP)
+	$(REMOVE)/$(BINUTILS_DIR)
 	$(UNTAR)/$(BINUTILS_SOURCE)
-	$(CHDIR)/$(BINUTILS_TMP); \
+	$(CHDIR)/$(BINUTILS_DIR); \
 		$(CONFIGURE) \
 			--target=$(TARGET) \
 			--prefix= \
@ -66,15 +66,15 @@ binutils: $(DL_DIR)/$(BINUTILS_SOURCE) | $(TARGET_DIR)
 			; \
 		$(MAKE); \
 	for bin in $(BINUTILS_BIN); do \
-		$(INSTALL_EXEC) $(BUILD_DIR)/$(BINUTILS_TMP)/binutils/$$bin $(TARGET_DIR)/bin/; \
+		$(INSTALL_EXEC) $(BUILD_DIR)/$(BINUTILS_DIR)/binutils/$$bin $(TARGET_DIR)/bin/; \
 	done
-	$(REMOVE)/$(BINUTILS_TMP)
+	$(REMOVE)/$(BINUTILS_DIR)
 	$(TOUCH)
 # -----------------------------------------------------------------------------
 UTIL-LINUX_VER    = 2.36
-UTIL-LINUX_TMP    = util-linux-$(UTIL-LINUX_VER)
+UTIL-LINUX_DIR    = util-linux-$(UTIL-LINUX_VER)
 UTIL-LINUX_SOURCE = util-linux-$(UTIL-LINUX_VER).tar.xz
 UTIL-LINUX_SITE   = https://www.kernel.org/pub/linux/utils/util-linux/v$(UTIL-LINUX_VER)
@ -84,9 +84,9 @@ $(DL_DIR)/$(UTIL-LINUX_SOURCE):
 UTUL-LINUX_DEPS   = ncurses zlib
 util-linux: $(UTUL-LINUX_DEPS) $(DL_DIR)/$(UTIL-LINUX_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(UTIL-LINUX_TMP)
+	$(REMOVE)/$(UTIL-LINUX_DIR)
 	$(UNTAR)/$(UTIL-LINUX_SOURCE)
-	$(CHDIR)/$(UTIL-LINUX_TMP); \
+	$(CHDIR)/$(UTIL-LINUX_DIR); \
 		autoreconf -fi; \
 		$(CONFIGURE) \
 			--prefix= \
@ -117,13 +117,13 @@ util-linux: $(UTUL-LINUX_DEPS) $(DL_DIR)/$(UTIL-LINUX_SOURCE) | $(TARGET_DIR)
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_LIBTOOL_LA)
 	$(REWRITE_PKGCONF_PC)
-	$(REMOVE)/$(UTIL-LINUX_TMP)
+	$(REMOVE)/$(UTIL-LINUX_DIR)
 	$(TOUCH)
 # -----------------------------------------------------------------------------
 ASTRA-SM_VER    = git
-ASTRA-SM_TMP    = astra-sm.$(ASTRA-SM_VER)
+ASTRA-SM_DIR    = astra-sm.$(ASTRA-SM_VER)
 ASTRA-SM_SOURCE = astra-sm.$(ASTRA-SM_VER)
 ASTRA-SM_SITE   = https://gitlab.com/crazycat69
@ -132,23 +132,23 @@ ASTRA-SM_DEPS   = openssl
 # workaround unrecognized command line options
 astra-sm: TARGET_ABI=""
 astra-sm: $(ASTRA-SM_DEPS) | $(TARGET_DIR)
-	$(REMOVE)/$(ASTRA-SM_TMP)
+	$(REMOVE)/$(ASTRA-SM_DIR)
 	$(GET-GIT-SOURCE) $(ASTRA-SM_SITE)/$(ASTRA-SM_SOURCE) $(DL_DIR)/$(ASTRA-SM_SOURCE)
 	$(CPDIR)/$(ASTRA-SM_SOURCE)
-	$(CHDIR)/$(ASTRA-SM_TMP); \
+	$(CHDIR)/$(ASTRA-SM_DIR); \
 		autoreconf -fi; \
 		$(CONFIGURE) \
 			--prefix= \
 			--without-lua \
 			; \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REMOVE)/$(ASTRA-SM_TMP)
+	$(REMOVE)/$(ASTRA-SM_DIR)
 	$(TOUCH)
 # -----------------------------------------------------------------------------
 IOZONE_VER    = 3_490
-IOZONE_TMP    = iozone$(IOZONE_VER)
+IOZONE_DIR    = iozone$(IOZONE_VER)
 IOZONE_SOURCE = iozone$(IOZONE_VER).tar
 IOZONE_SITE   = http://www.iozone.org/src/current
@ -156,21 +156,21 @@ $(DL_DIR)/$(IOZONE_SOURCE):
 	$(DOWNLOAD) $(IOZONE_SITE)/$(IOZONE_SOURCE)
 iozone: $(DL_DIR)/$(IOZONE_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(IOZONE_TMP)
+	$(REMOVE)/$(IOZONE_DIR)
 	$(UNTAR)/$(IOZONE_SOURCE)
-	$(CHDIR)/$(IOZONE_TMP)/src/current; \
+	$(CHDIR)/$(IOZONE_DIR)/src/current; \
 		sed -i -e "s/= gcc/= $(TARGET_CC)/" makefile; \
 		sed -i -e "s/= cc/= $(TARGET_CC)/" makefile; \
 		$(MAKE_ENV) \
 		$(MAKE) linux-arm; \
 		$(INSTALL_EXEC) iozone $(TARGET_BIN_DIR)/
-	$(REMOVE)/$(IOZONE_TMP)
+	$(REMOVE)/$(IOZONE_DIR)
 	$(TOUCH)
 # -----------------------------------------------------------------------------
 READLINE_VER    = 8.0
-READLINE_TMP    = readline-$(READLINE_VER)
+READLINE_DIR    = readline-$(READLINE_VER)
 READLINE_SOURCE = readline-$(READLINE_VER).tar.gz
 READLINE_SITE   = https://ftp.gnu.org/gnu/readline
@ -178,9 +178,9 @@ $(DL_DIR)/$(READLINE_SOURCE):
 	$(DOWNLOAD) $(READLINE_SITE)/$(READLINE_SOURCE)
 readline: $(DL_DIR)/$(READLINE_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(READLINE_TMP)
+	$(REMOVE)/$(READLINE_DIR)
 	$(UNTAR)/$(READLINE_SOURCE)
-	$(CHDIR)/$(READLINE_TMP); \
+	$(CHDIR)/$(READLINE_DIR); \
 		$(CONFIGURE) \
 			--prefix= \
 			--datarootdir=$(remove-datarootdir) \
@ -188,5 +188,5 @@ readline: $(DL_DIR)/$(READLINE_SOURCE) | $(TARGET_DIR)
 		$(MAKE) all; \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF_PC)
-	$(REMOVE)/$(READLINE_TMP)
+	$(REMOVE)/$(READLINE_DIR)
 	$(TOUCH)
--- a/make/target-tools.mk
+++ b/make/target-tools.mk