- rename TARGETPERFIX => TARGET_DIR

8 years ago · bda3051de4
18 changed files with 483 additions and 483 deletions
--- a/2
+++ b/2
@ -41,7 +41,7 @@ printenv:
 	@echo "'make help' lists useful targets."
 	@echo ""
 	@make --no-print-directory toolcheck
-	@make -i -s $(TARGETPREFIX)
+	@make -i -s $(TARGET_DIR)
 	@PATH=$(PATH):$(CROSS_DIR)/bin && \
 	if type -p $(TARGET)-gcc >/dev/null 2>&1; then \
 		echo "$(TARGET)-gcc found in PATH or in \$$CROSS_DIR/bin."; \
--- a/make/bootstrap.mk
+++ b/make/bootstrap.mk
@ -13,25 +13,25 @@ PLAT_LIBS  = $(TARGETLIB) $(STATICLIB)
 bootstrap: $(BOOTSTRAP)
 	@echo -e "$(TERM_YELLOW)Bootstrapped for $(shell echo $(BOXTYPE) | sed 's/.*/\u&/') $(BOXMODEL)$(TERM_NORMAL)"
-skeleton: | $(TARGETPREFIX)
+skeleton: | $(TARGET_DIR)
-	cp --remove-destination -a $(SKEL_ROOT)/* $(TARGETPREFIX)/
+	cp --remove-destination -a $(SKEL_ROOT)/* $(TARGET_DIR)/
 	if [ -d $(SKEL_ROOT)-$(BOXFAMILY)/ ]; then \
-		cp -a $(SKEL_ROOT)-$(BOXFAMILY)/* $(TARGETPREFIX)/; \
+		cp -a $(SKEL_ROOT)-$(BOXFAMILY)/* $(TARGET_DIR)/; \
 	fi
 	if [ -d $(STATIC_DIR)/ ]; then \
-		cp -a $(STATIC_DIR)/* $(TARGETPREFIX)/; \
+		cp -a $(STATIC_DIR)/* $(TARGET_DIR)/; \
 	fi
 targetprefix:
-	mkdir -p $(TARGETPREFIX)
+	mkdir -p $(TARGET_DIR)
-	mkdir -p $(TARGETPREFIX)/bin
+	mkdir -p $(TARGET_DIR)/bin
 	mkdir -p $(TARGETINCLUDE)
 	mkdir -p $(PKG_CONFIG_PATH)
 	make skeleton
-$(TARGETPREFIX):
+$(TARGET_DIR):
 	@echo "**********************************************************************"
-	@echo "TARGETPREFIX does not exist. You probably need to run 'make bootstrap'"
+	@echo "TARGET_DIR does not exist. You probably need to run 'make bootstrap'"
 	@echo "**********************************************************************"
 	@echo ""
 	@false
@ -51,31 +51,31 @@ $(HOST_DIR)/bin: $(HOST_DIR)
 $(STATICLIB):
 	mkdir -p $@
-$(TARGETLIB)/firmware: | $(TARGETPREFIX)
+$(TARGETLIB)/firmware: | $(TARGET_DIR)
 ifeq ($(BOXTYPE), coolstream)
 	mkdir -p $@
 	cp -a $(SOURCE_DIR)/$(NI_DRIVERS-BIN)/$(DRIVERS_DIR)/firmware/* $@/
 endif
-$(TARGETLIB): | $(TARGETPREFIX)
+$(TARGETLIB): | $(TARGET_DIR)
 	mkdir -p $@
 	cp -a $(SOURCE_DIR)/$(NI_DRIVERS-BIN)/$(DRIVERS_DIR)/libs/* $@
 ifeq ($(BOXTYPE), coolstream)
 	cp -a $(SOURCE_DIR)/$(NI_DRIVERS-BIN)/$(DRIVERS_DIR)/libcoolstream/$(shell echo -n $(NI_FFMPEG_BRANCH) | sed 's,/,-,g')/* $@
 endif
-$(TARGETLIB)/modules: | $(TARGETPREFIX)
+$(TARGETLIB)/modules: | $(TARGET_DIR)
 	mkdir -p $@
 	cp -a $(SOURCE_DIR)/$(NI_DRIVERS-BIN)/$(DRIVERS_DIR)/drivers/$(KERNEL_VERSION_FULL) $@/
-$(TARGETLIB)/libc.so.6: | $(TARGETPREFIX)
+$(TARGETLIB)/libc.so.6: | $(TARGET_DIR)
 	if test -e $(CROSS_DIR)/$(TARGET)/sys-root/lib; then \
 		cp -a $(CROSS_DIR)/$(TARGET)/sys-root/lib/*so* $(TARGETLIB); \
 	else \
 		cp -a $(CROSS_DIR)/$(TARGET)/lib/*so* $(TARGETLIB); \
 	fi
-$(TARGETPREFIX)/var/update: | $(TARGETPREFIX)
+$(TARGET_DIR)/var/update: | $(TARGET_DIR)
 	mkdir -p $@
 ifeq ($(BOXTYPE), coolstream)
 	cp -a $(SOURCE_DIR)/$(NI_DRIVERS-BIN)/$(DRIVERS_DIR)/uldr.bin $@/
@ -90,7 +90,7 @@ includes-and-libs: $(PLAT_INCS) $(PLAT_LIBS)
 modules: $(TARGETLIB)/modules
-blobs: $(TARGETPREFIX)/var/update
+blobs: $(TARGET_DIR)/var/update
 # helper target to create ccache links (make sure to have ccache installed in /usr/bin ;)
 ccache: find-ccache $(CCACHE) $(HOST_DIR)/bin
@ -225,5 +225,5 @@ $(HOST_DIR)/bin/resize2fs: $(ARCHIVE)/e2fsprogs-$(E2FSPROGS_VER).tar.gz | $(HOST
 PHONY += $(TARGETLIB)
 PHONY += $(TARGETLIB)/firmware
 PHONY += $(TARGETLIB)/modules
-PHONY += $(TARGETPREFIX)/var/update
+PHONY += $(TARGET_DIR)/var/update
 PHONY += ccache includes-and-libs modules targetprefix bootstrap blobs
--- a/make/clean.mk
+++ b/make/clean.mk
@ -2,7 +2,7 @@
 rebuild-clean:
 	-rm -rf $(BUILD_TMP)
-	-rm -rf $(TARGETPREFIX)
+	-rm -rf $(TARGET_DIR)
 	-rm -rf $(D)
 staging-clean:
--- a/make/devel-tools.mk
+++ b/make/devel-tools.mk
@ -3,7 +3,7 @@
 valgrind: valgrind-$(BOXSERIES)
 $(D)/valgrind-hd51 \
-$(D)/valgrind-hd2: $(ARCHIVE)/valgrind-$(VALGRIND_VER).tar.bz2 | $(TARGETPREFIX)
+$(D)/valgrind-hd2: $(ARCHIVE)/valgrind-$(VALGRIND_VER).tar.bz2 | $(TARGET_DIR)
 	$(UNTAR)/valgrind-$(VALGRIND_VER).tar.bz2
 	cd $(BUILD_TMP)/valgrind-$(VALGRIND_VER) && \
 	$(PATCH)/valgrind-fix-$(BOXSERIES)-build.patch && \
@ -15,13 +15,13 @@ $(D)/valgrind-hd2: $(ARCHIVE)/valgrind-$(VALGRIND_VER).tar.bz2 | $(TARGETPREFIX)
 			--mandir=/.remove \
 			--datadir=/.remove && \
 		$(MAKE) all && \
-		make install DESTDIR=$(TARGETPREFIX)
+		make install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/valgrind.pc
-	rm $(TARGETPREFIX)/bin/callgrind_annotate
+	rm $(TARGET_DIR)/bin/callgrind_annotate
-	rm $(TARGETPREFIX)/bin/callgrind_control
+	rm $(TARGET_DIR)/bin/callgrind_control
-	rm $(TARGETPREFIX)/bin/cg_annotate
+	rm $(TARGET_DIR)/bin/cg_annotate
-	rm $(TARGETPREFIX)/bin/cg_diff
+	rm $(TARGET_DIR)/bin/cg_diff
-	rm $(TARGETPREFIX)/bin/ms_print
+	rm $(TARGET_DIR)/bin/ms_print
 	$(REMOVE)/valgrind-$(VALGRIND_VER)
 	touch $@
@ -38,12 +38,12 @@ $(D)/valgrind-hd1:
 			--mandir=/.remove \
 			--datadir=/.remove && \
 		$(MAKE) all && \
-		make install DESTDIR=$(TARGETPREFIX)
+		make install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/valgrind.pc
 	$(REMOVE)/valgrind
 	touch $@
-$(D)/strace: $(ARCHIVE)/strace-$(STRACE_VER).tar.xz | $(TARGETPREFIX)
+$(D)/strace: $(ARCHIVE)/strace-$(STRACE_VER).tar.xz | $(TARGET_DIR)
 	$(UNTAR)/strace-$(STRACE_VER).tar.xz
 	cd $(BUILD_TMP)/strace-$(STRACE_VER) && \
 	$(PATCH)/strace-error_prints-fix-potential-program_invocation_name-t.patch && \
@ -52,13 +52,13 @@ $(D)/strace: $(ARCHIVE)/strace-$(STRACE_VER).tar.xz | $(TARGETPREFIX)
 			--mandir=$(BUILD_TMP)/.remove \
 			--enable-silent-rules && \
 		$(MAKE) all && \
-		make install prefix=$(TARGETPREFIX)
+		make install prefix=$(TARGET_DIR)
-	rm $(TARGETPREFIX)/bin/strace-graph
+	rm $(TARGET_DIR)/bin/strace-graph
-	rm $(TARGETPREFIX)/bin/strace-log-merge
+	rm $(TARGET_DIR)/bin/strace-log-merge
 	$(REMOVE)/strace-$(STRACE_VER)
 	touch $@
-$(D)/gdb: $(D)/zlib $(D)/libncurses $(ARCHIVE)/gdb-$(GDB_VER).tar.xz $(D)/zlib $(D)/libncurses | $(TARGETPREFIX)
+$(D)/gdb: $(D)/zlib $(D)/libncurses $(ARCHIVE)/gdb-$(GDB_VER).tar.xz $(D)/zlib $(D)/libncurses | $(TARGET_DIR)
 	$(REMOVE)/gdb-$(GDB_VER)
 	$(UNTAR)/gdb-$(GDB_VER).tar.xz
 	set -e; cd $(BUILD_TMP)/gdb-$(GDB_VER); \
@ -72,8 +72,8 @@ $(D)/gdb: $(D)/zlib $(D)/libncurses $(ARCHIVE)/gdb-$(GDB_VER).tar.xz $(D)/zlib $
 			--with-zlib \
 			--enable-static; \
 		$(MAKE) all-gdb; \
-		make install-gdb prefix=$(TARGETPREFIX)
+		make install-gdb prefix=$(TARGET_DIR)
-	rm -rf $(TARGETPREFIX)/share/gdb/system-gdbinit
+	rm -rf $(TARGET_DIR)/share/gdb/system-gdbinit
-	find $(TARGETPREFIX)/share/gdb/syscalls -type f -not -name 'arm-linux.xml' -not -name 'gdb-syscalls.dtd' -print0 | xargs -0 rm --
+	find $(TARGET_DIR)/share/gdb/syscalls -type f -not -name 'arm-linux.xml' -not -name 'gdb-syscalls.dtd' -print0 | xargs -0 rm --
 	$(REMOVE)/gdb-$(GDB_VER)
 	touch $@
--- a/make/environment.mk
+++ b/make/environment.mk
@ -137,7 +137,7 @@ BUILD_TMP     = $(BASE_DIR)/build_tmp
 D             = $(BASE_DIR)/deps
 DEPDIR        = $(D)
 HOST_DIR      = $(BASE_DIR)/host
-TARGETPREFIX ?= $(BASE_DIR)/root
+TARGET_DIR   ?= $(BASE_DIR)/root
 SOURCE_DIR    = $(BASE_DIR)/source
 MAKE_DIR      = $(BASE_DIR)/make
 STAGING_DIR   = $(BASE_DIR)/staging
@ -154,8 +154,8 @@ IMAGEFILES    = $(BASE_DIR)/archive-imagefiles
 SOURCES       = $(BASE_DIR)/archive-sources
 SKEL_ROOT     = $(BASE_DIR)/skel-root/$(BOXTYPE)/$(BOXSERIES)
 STATICLIB     = $(STATIC_DIR)/lib
-TARGETLIB     = $(TARGETPREFIX)/lib
+TARGETLIB     = $(TARGET_DIR)/lib
-TARGETINCLUDE = $(TARGETPREFIX)/include
+TARGETINCLUDE = $(TARGET_DIR)/include
 BUILD        ?= $(shell /usr/share/libtool/config.guess 2>/dev/null || /usr/share/libtool/config/config.guess 2>/dev/null || /usr/share/misc/config.guess)
 CCACHE        = /usr/bin/ccache
 CCACHE_DIR    = $(HOME)/.ccache-ni-buildsystem-$(BOXARCH)-$(BOXSERIES)
@ -257,11 +257,11 @@ PKG_CONFIG_PATH = $(PKG_CONFIG_LIBDIR)/pkgconfig
 REWRITE_LIBTOOL        = sed -i "s,^libdir=.*,libdir='$(TARGETLIB)'," $(TARGETLIB)
 REWRITE_LIBTOOL_STATIC = sed -i "s,^libdir=.*,libdir='$(TARGETLIB)'," $(STATICLIB)
 REWRITE_LIBTOOLDEP     = sed -i -e "s,\(^dependency_libs='\| \|-L\|^dependency_libs='\)/lib,\ $(TARGETLIB),g" $(TARGETLIB)
-REWRITE_PKGCONF        = sed -i "s,^prefix=.*,prefix='$(TARGETPREFIX)',"
+REWRITE_PKGCONF        = sed -i "s,^prefix=.*,prefix='$(TARGET_DIR)',"
 # unpack tarballs, clean up
 UNTAR = tar -C $(BUILD_TMP) -xf $(ARCHIVE)
-REMOVE = rm -rf $(BUILD_TMP)/.remove $(TARGETPREFIX)/.remove $(BUILD_TMP)
+REMOVE = rm -rf $(BUILD_TMP)/.remove $(TARGET_DIR)/.remove $(BUILD_TMP)
 PATCH = patch -p1 -i $(PATCHES)
 # wget tarballs into archive directory
@ -331,6 +331,6 @@ TANGO_REMOTE_REPO	= tango
 # execute local scripts
 define local-script
 	@if [ -x $(LOCAL_DIR)/scripts/$(1) ]; then \
-		$(LOCAL_DIR)/scripts/$(1) $(2) $(TARGETPREFIX) $(BUILD_TMP); \
+		$(LOCAL_DIR)/scripts/$(1) $(2) $(TARGET_DIR) $(BUILD_TMP); \
 	fi
 endef
--- a/make/gstreamer.mk
+++ b/make/gstreamer.mk
@ -42,7 +42,7 @@ $(D)/gstreamer: $(D)/libglib2 $(D)/libxml2 $(D)/glib-networking $(ARCHIVE)/$(GST
 			ac_cv_header_valgrind_valgrind_h=no \
 		; \
 		$(MAKE); \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gstreamer-1.0.pc
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gstreamer-base-1.0.pc
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gstreamer-controller-1.0.pc
@ -85,8 +85,8 @@ $(D)/gst_plugins_base: $(D)/zlib $(D)/libglib2 $(D)/orc $(D)/gstreamer $(D)/alsa
 			--disable-gtk-doc-html \
 		; \
 		$(MAKE); \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	for i in `cd $(TARGETPREFIX)/lib/gstreamer-1.0; echo *.la`; do \
+	for i in `cd $(TARGET_DIR)/lib/gstreamer-1.0; echo *.la`; do \
 		$(REWRITE_LIBTOOL)/gstreamer-1.0/$$i; done
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gstreamer-allocators-1.0.pc
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gstreamer-app-1.0.pc
@ -149,8 +149,8 @@ $(D)/gst_plugins_good: $(D)/libpng $(D)/libjpeg $(D)/gstreamer $(D)/gst_plugins_
 			--disable-gtk-doc-html \
 		; \
 		$(MAKE); \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	for i in `cd $(TARGETPREFIX)/lib/gstreamer-1.0; echo *.la`; do \
+	for i in `cd $(TARGET_DIR)/lib/gstreamer-1.0; echo *.la`; do \
 		$(REWRITE_LIBTOOL)/gstreamer-1.0/$$i; done
 	$(REMOVE)/gst-plugins-good-$(GST_PLUGINS_GOOD_VER)
 	touch $@
@ -187,8 +187,8 @@ $(D)/gst_plugins_bad: $(D)/libass $(D)/libcurl $(D)/libxml2 $(D)/openssl $(D)/li
 			--disable-gtk-doc-html \
 		; \
 		$(MAKE); \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	for i in `cd $(TARGETPREFIX)/lib/gstreamer-1.0; echo *.la`; do \
+	for i in `cd $(TARGET_DIR)/lib/gstreamer-1.0; echo *.la`; do \
 		$(REWRITE_LIBTOOL)/gstreamer-1.0/$$i; done
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gstreamer-codecparsers-1.0.pc
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gstreamer-bad-audio-1.0.pc
@ -238,8 +238,8 @@ $(D)/gst_plugins_ugly: $(D)/gstreamer $(D)/gst_plugins_base $(ARCHIVE)/$(GST_PLU
 			--disable-gtk-doc-html \
 		; \
 		$(MAKE); \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	for i in `cd $(TARGETPREFIX)/lib/gstreamer-1.0; echo *.la`; do \
+	for i in `cd $(TARGET_DIR)/lib/gstreamer-1.0; echo *.la`; do \
 		$(REWRITE_LIBTOOL)/gstreamer-1.0/$$i; done
 	$(REMOVE)/gst-plugins-ugly-$(GST_PLUGINS_UGLY_VER)
 	touch $@
@ -266,8 +266,8 @@ $(D)/gst_plugin_subsink: $(D)/gstreamer $(D)/gst_plugins_base $(D)/gst_plugins_g
 			--enable-silent-rules \
 		; \
 		$(MAKE); \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	for i in `cd $(TARGETPREFIX)/lib/gstreamer-1.0; echo *.la`; do \
+	for i in `cd $(TARGET_DIR)/lib/gstreamer-1.0; echo *.la`; do \
 		$(REWRITE_LIBTOOL)/gstreamer-1.0/$$i; done
 	$(REMOVE)/gstreamer$(GST_PLUGIN_SUBSINK_VER)-plugin-subsink
 	touch $@
@ -305,8 +305,8 @@ $(D)/gst_plugins_dvbmediasink: $(D)/gstreamer $(D)/gst_plugins_base $(D)/gst_plu
 			--with-gstversion=1.0 \
 		; \
 		$(MAKE) all; \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	for i in `cd $(TARGETPREFIX)/lib/gstreamer-1.0; echo *.la`; do \
+	for i in `cd $(TARGET_DIR)/lib/gstreamer-1.0; echo *.la`; do \
 		$(REWRITE_LIBTOOL)/gstreamer-1.0/$$i; done
 	$(REMOVE)/gstreamer$(GST_PLUGINS_DVBMEDIASINK_VER)-plugin-dvbmediasink
 	touch $@
@ -330,12 +330,12 @@ $(D)/orc: $(ARCHIVE)/$(ORC_SOURCE)
 			--prefix= \
 		; \
 		$(MAKE) all; \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/orc-0.4.pc
 	$(REWRITE_LIBTOOL)/liborc-0.4.la
 	$(REWRITE_LIBTOOL)/liborc-test-0.4.la
 	$(REWRITE_LIBTOOLDEP)/liborc-test-0.4.la
-	rm -f $(addprefix $(TARGETPREFIX)/bin/,orc-bugreport orcc)
+	rm -f $(addprefix $(TARGET_DIR)/bin/,orc-bugreport orcc)
 	$(REMOVE)/orc-$(ORC_VER)
 	touch $@
@ -356,11 +356,11 @@ $(D)/libdca: $(ARCHIVE)/$(LIBDCA_SOURCE)
 			--mandir=/.remove \
 		; \
 		$(MAKE) all; \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libdca.pc
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libdts.pc
 	$(REWRITE_LIBTOOL)/libdca.la
-	rm -f $(addprefix $(TARGETPREFIX)/bin/,extract_dca extract_dts)
+	rm -f $(addprefix $(TARGET_DIR)/bin/,extract_dca extract_dts)
 	$(REMOVE)/libdca-$(LIBDCA_VER)
 	touch $@
@ -381,10 +381,10 @@ $(D)/nettle: $(D)/gmp $(ARCHIVE)/$(NETTLE_SOURCE)
 			--disable-documentation \
 		; \
 		$(MAKE) all; \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/hogweed.pc
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/nettle.pc
-	rm -f $(addprefix $(TARGETPREFIX)/bin/,sexp-conv nettle-hash nettle-pbkdf2 nettle-lfib-stream pkcs1-conv)
+	rm -f $(addprefix $(TARGET_DIR)/bin/,sexp-conv nettle-hash nettle-pbkdf2 nettle-lfib-stream pkcs1-conv)
 	$(REMOVE)/nettle-$(NETTLE_VER)
 	touch $@
@ -407,7 +407,7 @@ $(D)/gmp: $(ARCHIVE)/$(GMP_SOURCE)
 			--infodir=/.remove \
 		; \
 		$(MAKE); \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_LIBTOOL)/libgmp.la
 	$(REMOVE)/gmp-$(GMP_VER_MAJOR)
 	touch $@
@ -433,7 +433,7 @@ $(D)/gnutls: $(D)/nettle $(D)/ca-bundle $(ARCHIVE)/$(GNUTLS_SOURCE)
 			--datarootdir=/.remove \
 			--with-included-libtasn1 \
 			--enable-local-libopts \
-			--with-libpthread-prefix=$(TARGETPREFIX) \
+			--with-libpthread-prefix=$(TARGET_DIR) \
 			--with-included-unistring \
 			--with-default-trust-store-dir=$(CA_BUNDLE_DIR)/ \
 			--disable-guile \
@ -441,12 +441,12 @@ $(D)/gnutls: $(D)/nettle $(D)/ca-bundle $(ARCHIVE)/$(GNUTLS_SOURCE)
 			--without-p11-kit \
 		; \
 		$(MAKE); \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gnutls.pc
 	$(REWRITE_LIBTOOL)/libgnutls.la
 	$(REWRITE_LIBTOOL)/libgnutlsxx.la
 	$(REWRITE_LIBTOOLDEP)/libgnutlsxx.la
-	rm -f $(addprefix $(TARGETPREFIX)/bin/,psktool gnutls-cli-debug certtool srptool ocsptool gnutls-serv gnutls-cli)
+	rm -f $(addprefix $(TARGET_DIR)/bin/,psktool gnutls-cli-debug certtool srptool ocsptool gnutls-serv gnutls-cli)
 	$(REMOVE)/gnutls-$(GNUTLS_VER)
 	touch $@
@ -471,7 +471,7 @@ $(D)/glib-networking: $(D)/gnutls $(D)/libglib2 $(ARCHIVE)/$(GLIB-NETWORKING_SOU
 			--localedir=/.remove \
 		; \
 		$(MAKE); \
-		$(MAKE) install prefix=$(TARGETPREFIX)
+		$(MAKE) install prefix=$(TARGET_DIR)
 	$(REMOVE)/glib-networking-$(GLIB-NETWORKING_VER)
 	touch $@
@ -507,7 +507,7 @@ $(D)/alsa-lib: $(ARCHIVE)/$(ALSA-LIB_SOURCE)
 			--disable-python \
 		; \
 		$(MAKE); \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/alsa.pc
 	$(REWRITE_LIBTOOL)/libasound.la
 	$(REMOVE)/alsa-lib-$(ALSA-LIB_VER)
@ -537,7 +537,7 @@ $(D)/libsoup: $(D)/sqlite $(D)/libxml2 $(D)/libglib2 $(ARCHIVE)/$(LIBSOUP_SOURCE
 			--disable-gtk-doc-pdf \
 		; \
 		$(MAKE); \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX) itlocaledir=$$(TARGETPREFIX)/.remove
+		$(MAKE) install DESTDIR=$(TARGET_DIR) itlocaledir=$$(TARGET_DIR)/.remove
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libsoup-2.4.pc
 	$(REWRITE_LIBTOOL)/libsoup-2.4.la
 	$(REMOVE)/libsoup-$(LIBSOUP_VER)
@ -560,9 +560,9 @@ $(D)/sqlite: $(ARCHIVE)/$(SQLITE_SOURCE)
 			--mandir=/.remove \
 		; \
 		$(MAKE) all; \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/sqlite3.pc
 	$(REWRITE_LIBTOOL)/libsqlite3.la
-	rm -f $(addprefix $(TARGETPREFIX)/bin/,sqlite3)
+	rm -f $(addprefix $(TARGET_DIR)/bin/,sqlite3)
 	$(REMOVE)/sqlite-autoconf-$(SQLITE_VER)
 	touch $@
--- a/make/image-update.mk
+++ b/make/image-update.mk
@ -45,7 +45,7 @@ u-FritzCallMonitor:
 	mkdir -pv $(UPDATE_INST_DIR)/bin  && \
 	mkdir -pv $(UPDATE_INST_DIR)/var/tuxbox/config && \
 	cp -f $(BIN)/FritzCallMonitor $(UPDATE_INST_DIR)/bin/ && \
-	cp -f $(TARGETPREFIX)/var/tuxbox/config/FritzCallMonitor.cfg $(UPDATE_INST_DIR)/var/tuxbox/config/
+	cp -f $(TARGET_DIR)/var/tuxbox/config/FritzCallMonitor.cfg $(UPDATE_INST_DIR)/var/tuxbox/config/
 	$(MAKE) u-update-bin \
 			UPDATE_MD5FILE=$(UPDATE_MD5FILE-BOXMODEL) \
 			UPDATE_NAME=FritzCallMonitor-$(BOXMODEL) \
@ -62,7 +62,7 @@ u-FritzInfoMonitor:
 	mkdir -pv $(UPDATE_INST_DIR)/lib/tuxbox/plugins && \
 	cp -f $(LIBPLUG)/FritzInfoMonitor.cfg $(UPDATE_INST_DIR)/lib/tuxbox/plugins/ && \
 	cp -f $(LIBPLUG)/FritzInfoMonitor.so $(UPDATE_INST_DIR)/lib/tuxbox/plugins/ && \
-	cp -f $(TARGETPREFIX)/var/tuxbox/config/FritzCallMonitor.cfg $(UPDATE_INST_DIR)/var/tuxbox/config/
+	cp -f $(TARGET_DIR)/var/tuxbox/config/FritzCallMonitor.cfg $(UPDATE_INST_DIR)/var/tuxbox/config/
 	$(MAKE) u-update-bin \
 			UPDATE_MD5FILE=$(UPDATE_MD5FILE-BOXMODEL) \
 			UPDATE_NAME=FritzInfoMonitor-$(BOXMODEL) \
@ -71,7 +71,7 @@ u-FritzInfoMonitor:
 u-lcd4linux: $(D)/lcd4linux
 ifeq ($(DEBUG), no)
-	$(TARGET)-strip $(TARGETPREFIX)/bin/lcd4linux
+	$(TARGET)-strip $(TARGET_DIR)/bin/lcd4linux
 endif
 	$(MAKE) u-init
 	echo "service lcd4linux stop"									>> $(PREINSTALL_SH)
@ -80,12 +80,12 @@ endif
 	echo "/bin/sync"										>> $(POSTINSTALL_SH)
 	echo "service lcd4linux start"									>> $(POSTINSTALL_SH)
 	mkdir -pv $(UPDATE_INST_DIR)/bin && \
-	cp -f $(TARGETPREFIX)/bin/lcd4linux $(UPDATE_INST_DIR)/bin/ && \
+	cp -f $(TARGET_DIR)/bin/lcd4linux $(UPDATE_INST_DIR)/bin/ && \
 	$(MAKE) u-update-bin \
 			UPDATE_MD5FILE=$(UPDATE_MD5FILE-BOXSERIES) \
 			UPDATE_NAME=lcd4linux-$(BOXSERIES) \
 			UPDATE_DESC="LCD4Linux [$(BOXSERIES)]" \
-			UPDATE_VERSION_STRING=`strings $(TARGETPREFIX)/bin/lcd4linux | grep -m1 LCD4Linux | cut -d" " -f2`
+			UPDATE_VERSION_STRING=`strings $(TARGET_DIR)/bin/lcd4linux | grep -m1 LCD4Linux | cut -d" " -f2`
 u-pr-auto-timer:
 	$(MAKE) u-init
@ -114,11 +114,11 @@ u-neutrino: neutrino-clean
 	echo "killall start_neutrino neutrino; sleep 5"	>> $(PREINSTALL_SH)
 	echo "sync; /bin/busybox reboot"		>> $(POSTINSTALL_SH)
 	$(MAKE) neutrino
-	install -D -m 0644 $(TARGETPREFIX)/.version $(UPDATE_INST_DIR)/.version
+	install -D -m 0644 $(TARGET_DIR)/.version $(UPDATE_INST_DIR)/.version
-	install -D -m 0755 $(TARGETPREFIX)/etc/init.d/start_neutrino $(UPDATE_INST_DIR)/etc/init.d/start_neutrino
+	install -D -m 0755 $(TARGET_DIR)/etc/init.d/start_neutrino $(UPDATE_INST_DIR)/etc/init.d/start_neutrino
-	install -D -m 0755 $(TARGETPREFIX)/bin/neutrino $(UPDATE_INST_DIR)/bin/neutrino
+	install -D -m 0755 $(TARGET_DIR)/bin/neutrino $(UPDATE_INST_DIR)/bin/neutrino
-	install -D -m 0644 $(TARGETPREFIX)/share/tuxbox/neutrino/locale/deutsch.locale $(UPDATE_INST_DIR)/share/tuxbox/neutrino/locale/deutsch.locale
+	install -D -m 0644 $(TARGET_DIR)/share/tuxbox/neutrino/locale/deutsch.locale $(UPDATE_INST_DIR)/share/tuxbox/neutrino/locale/deutsch.locale
-	install -D -m 0644 $(TARGETPREFIX)/share/tuxbox/neutrino/locale/english.locale $(UPDATE_INST_DIR)/share/tuxbox/neutrino/locale/english.locale
+	install -D -m 0644 $(TARGET_DIR)/share/tuxbox/neutrino/locale/english.locale $(UPDATE_INST_DIR)/share/tuxbox/neutrino/locale/english.locale
 ifeq ($(DEBUG), no)
 	find $(UPDATE_INST_DIR)/bin -type f ! -name *.sh -print0 | xargs -0 $(TARGET)-strip || true
 endif
@ -130,8 +130,8 @@ u-neutrino-full: neutrino-clean
 	echo "killall start_neutrino neutrino; sleep 5"	>> $(PREINSTALL_SH)
 	echo "sync; /bin/busybox reboot"		>> $(POSTINSTALL_SH)
 	$(MAKE) neutrino NEUTRINO_INST_DIR=$(UPDATE_INST_DIR)
-	install -D -m 0644 $(TARGETPREFIX)/.version $(UPDATE_INST_DIR)/.version
+	install -D -m 0644 $(TARGET_DIR)/.version $(UPDATE_INST_DIR)/.version
-	install -D -m 0755 $(TARGETPREFIX)/etc/init.d/start_neutrino $(UPDATE_INST_DIR)/etc/init.d/start_neutrino
+	install -D -m 0755 $(TARGET_DIR)/etc/init.d/start_neutrino $(UPDATE_INST_DIR)/etc/init.d/start_neutrino
 ifeq ($(DEBUG), no)
 	find $(UPDATE_INST_DIR)/bin -type f ! -name *.sh -print0 | xargs -0 $(TARGET)-strip || true
 endif
@ -149,9 +149,9 @@ u-openvpn-setup:
 	echo "wget -q "http://localhost/control/message?popup=OpenVPN-Plugin%20installed." -O /dev/null"	>> $(POSTINSTALL_SH)
 	echo "wget -q "http://localhost/control/reloadplugins" -O /dev/null"					>> $(POSTINSTALL_SH)
 	#$(MAKE) openvpn
-	#$(TARGET)-strip $(TARGETPREFIX)/sbin/openvpn
+	#$(TARGET)-strip $(TARGET_DIR)/sbin/openvpn
 	#mkdir -p $(UPDATE_INST_DIR)/var/sbin  && \
-	#cp -f $(TARGETPREFIX)/sbin/openvpn $(UPDATE_INST_DIR)/var/sbin
+	#cp -f $(TARGET_DIR)/sbin/openvpn $(UPDATE_INST_DIR)/var/sbin
 	cp -a $(SOURCES)/openvpn-setup/* $(UPDATE_INST_DIR)/
 	$(MAKE) u-update-bin \
 			UPDATE_NAME=openvpn-setup-$(BOXSERIES)-v011 \
@ -162,7 +162,7 @@ u-update.urls: update.urls
 	$(MAKE) u-init
 	echo "wget -q "http://localhost/control/message?popup=update.urls%20installed." -O /dev/null"	>> $(POSTINSTALL_SH)
 	mkdir -pv $(UPDATE_INST_DIR)/var/etc
-	cp -f $(TARGETPREFIX)/var/etc/update.urls $(UPDATE_INST_DIR)/var/etc/
+	cp -f $(TARGET_DIR)/var/etc/update.urls $(UPDATE_INST_DIR)/var/etc/
 	$(MAKE) u-update-bin \
 			UPDATE_NAME=update.urls \
 			UPDATE_DESC=update.urls
--- a/make/kernel-arm.mk
+++ b/make/kernel-arm.mk
@ -7,7 +7,7 @@ MODULES_DIR	= $(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules/lib/modules/$(KERNEL_
 TARGETMODULES	= $(TARGETLIB)/modules/$(KERNEL_VERSION_FULL)
-$(D)/kernel-arm: $(SOURCE_DIR)/$(NI_LINUX-KERNEL) | $(TARGETPREFIX)
+$(D)/kernel-arm: $(SOURCE_DIR)/$(NI_LINUX-KERNEL) | $(TARGET_DIR)
 	cd $(SOURCE_DIR)/$(NI_LINUX-KERNEL) && \
 		git checkout $(KERNEL_BRANCH) && \
 	tar -C $(SOURCE_DIR) -cp $(NI_LINUX-KERNEL) --exclude-vcs | tar -C $(BUILD_TMP) -x
@ -32,4 +32,4 @@ kernel-arm-modules: $(D)/kernel-arm
 	make depmod-arm
 depmod-arm:
-	PATH=$(PATH):/sbin:/usr/sbin depmod -b $(TARGETPREFIX) $(KERNEL_VERSION_FULL)
+	PATH=$(PATH):/sbin:/usr/sbin depmod -b $(TARGET_DIR) $(KERNEL_VERSION_FULL)
--- a/make/kernel-cst.mk
+++ b/make/kernel-cst.mk
@ -40,7 +40,7 @@ kernel-cst-install-all:
 	#
 	make clean > /dev/null 2>&1
-$(D)/kernel-cst-hd2: $(SOURCE_DIR)/$(NI_LINUX-KERNEL) $(SOURCE_DIR)/$(NI_DRIVERS-BIN) | $(TARGETPREFIX)
+$(D)/kernel-cst-hd2: $(SOURCE_DIR)/$(NI_LINUX-KERNEL) $(SOURCE_DIR)/$(NI_DRIVERS-BIN) | $(TARGET_DIR)
 	cd $(SOURCE_DIR)/$(NI_LINUX-KERNEL) && \
 		git checkout $(KERNEL_BRANCH) && \
 	tar -C $(SOURCE_DIR) -cp $(NI_LINUX-KERNEL) --exclude-vcs | tar -C $(BUILD_TMP) -x
@ -69,7 +69,7 @@ endif
 kernel-cst-install-hd2: $(D)/kernel-cst-hd2
 	cp -af $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-vmlinux.ub.gz $(KERNEL_DESTDIR)/vmlinux.ub.gz
-$(D)/kernel-cst-hd1: $(SOURCE_DIR)/$(NI_LINUX-KERNEL) | $(TARGETPREFIX)
+$(D)/kernel-cst-hd1: $(SOURCE_DIR)/$(NI_LINUX-KERNEL) | $(TARGET_DIR)
 	cd $(SOURCE_DIR)/$(NI_LINUX-KERNEL) && \
 		git checkout $(KERNEL_BRANCH) && \
 	tar -C $(SOURCE_DIR) -cp $(NI_LINUX-KERNEL) --exclude-vcs | tar -C $(BUILD_TMP) -x
@ -125,10 +125,10 @@ kernel-cst-modules-hd2: kernel-cst
 	make depmod-hd2
 depmod-hd1:
-	PATH=$(PATH):/sbin:/usr/sbin depmod -b $(TARGETPREFIX) $(KERNEL_VERSION_FULL)
+	PATH=$(PATH):/sbin:/usr/sbin depmod -b $(TARGET_DIR) $(KERNEL_VERSION_FULL)
 	mv $(TARGETMODULES)/modules.dep $(TARGETMODULES)/.modules.dep
 	rm $(TARGETMODULES)/modules.*
 	mv $(TARGETMODULES)/.modules.dep $(TARGETMODULES)/modules.dep
 depmod-hd2:
-	PATH=$(PATH):/sbin:/usr/sbin depmod -b $(TARGETPREFIX) $(KERNEL_VERSION_FULL)
+	PATH=$(PATH):/sbin:/usr/sbin depmod -b $(TARGET_DIR) $(KERNEL_VERSION_FULL)
--- a/make/neutrino.mk
+++ b/make/neutrino.mk
@ -165,17 +165,17 @@ $(LH_OBJDIR)/config.status: $(NEUTRINO_DEPS)
 			--with-target=cdk \
 			--with-boxtype=$(BOXMODEL)
-NEUTRINO_INST_DIR ?= $(TARGETPREFIX)
+NEUTRINO_INST_DIR ?= $(TARGET_DIR)
 $(D)/neutrino: $(N_OBJDIR)/config.status
 	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
-	$(MAKE) -C $(N_OBJDIR) all     DESTDIR=$(TARGETPREFIX)
+	$(MAKE) -C $(N_OBJDIR) all     DESTDIR=$(TARGET_DIR)
 	$(MAKE) -C $(N_OBJDIR) install DESTDIR=$(NEUTRINO_INST_DIR)
-	make $(TARGETPREFIX)/.version
+	make $(TARGET_DIR)/.version
 	touch $@
 $(D)/libstb-hal: $(LH_OBJDIR)/config.status
 	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
-	$(MAKE) -C $(LH_OBJDIR) all     DESTDIR=$(TARGETPREFIX)
+	$(MAKE) -C $(LH_OBJDIR) all     DESTDIR=$(TARGET_DIR)
 	$(MAKE) -C $(LH_OBJDIR) install DESTDIR=$(NEUTRINO_INST_DIR)
 	$(REWRITE_LIBTOOL)/libstb-hal.la
 	touch $@
@ -186,10 +186,10 @@ ifeq ($(CLEAN), yes)
 endif
 	$(MAKE) $(N_OBJDIR)/config.status
 	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
-	$(MAKE) -C $(N_OBJDIR) all DESTDIR=$(TARGETPREFIX)
+	$(MAKE) -C $(N_OBJDIR) all DESTDIR=$(TARGET_DIR)
-	install -D -m 755 $(N_OBJDIR)/src/neutrino $(TARGETPREFIX)/bin/neutrino
+	install -D -m 755 $(N_OBJDIR)/src/neutrino $(TARGET_DIR)/bin/neutrino
 ifneq ($(DEBUG), yes)
-	$(TARGET)-strip $(TARGETPREFIX)/bin/neutrino
+	$(TARGET)-strip $(TARGET_DIR)/bin/neutrino
 endif
 	make done
--- a/make/plugins-extra.mk
+++ b/make/plugins-extra.mk
@ -12,7 +12,7 @@ $(LIBPLUG)/links.so: $(D)/zlib $(D)/openssl $(D)/libpng $(D)/libjpeg $(D)/giflib
 		export RANLIB=$(TARGET)-ranlib && \
 		export OBJDUMP=$(TARGET)-objdump && \
 		export STRIP=$(TARGET)-strip && \
-		export SYSROOT=$(TARGETPREFIX) && \
+		export SYSROOT=$(TARGET_DIR) && \
 		export PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) && \
 		export LD_LIBRARY_PATH=$(TARGETLIB) && \
 		export CFLAGS="$(TARGET_CFLAGS)" && \
@ -29,7 +29,7 @@ $(LIBPLUG)/links.so: $(D)/zlib $(D)/openssl $(D)/libpng $(D)/libjpeg $(D)/giflib
 			--enable-graphics \
 			--enable-javascript && \
 		$(MAKE) && \
-		DESTDIR=$(TARGETPREFIX) make install prefix=$(TARGETPREFIX)
+		DESTDIR=$(TARGET_DIR) make install prefix=$(TARGET_DIR)
 	$(REMOVE)/links
 	mv -f $(BIN)/links $(LIBPLUG)/links.so
 	echo "name=Links Webbrowser"	 > $(LIBPLUG)/links.cfg
@ -81,7 +81,7 @@ stbup: $(BIN)/stbup
 $(BIN)/stbup: $(BIN)
 	pushd $(SOURCES)/stbup && \
 	$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) stbup.c -o $@ && \
-	install -m 644 stbup.conf $(TARGETPREFIX)/etc && \
+	install -m 644 stbup.conf $(TARGET_DIR)/etc && \
-	install -m 755 stbup.init $(TARGETPREFIX)/etc/init.d/stbup
+	install -m 755 stbup.init $(TARGET_DIR)/etc/init.d/stbup
-	ln -s stbup $(TARGETPREFIX)/etc/init.d/S99stbup
+	ln -s stbup $(TARGET_DIR)/etc/init.d/S99stbup
-	ln -s stbup $(TARGETPREFIX)/etc/init.d/K01stbup
+	ln -s stbup $(TARGET_DIR)/etc/init.d/K01stbup
--- a/make/plugins.mk
+++ b/make/plugins.mk
@ -1,26 +1,26 @@
 # makefile for plugins
-TARGETPREFIX ?= $(DESTDIR)
+TARGET_DIR ?= $(DESTDIR)
 # workaround make-warnings
-T = $(TARGETPREFIX)/T
+T = $(TARGET_DIR)/T
 $(T):
 	mkdir -p $@
 	cd $@ && rm -r T
 # Some useful variables
-BIN		= $(TARGETPREFIX)/bin
+BIN		= $(TARGET_DIR)/bin
-ETCINIT		= $(TARGETPREFIX)/etc/init.d
+ETCINIT		= $(TARGET_DIR)/etc/init.d
-LIBPLUG		= $(TARGETPREFIX)/lib/tuxbox/plugins
+LIBPLUG		= $(TARGET_DIR)/lib/tuxbox/plugins
-SHAREICONS	= $(TARGETPREFIX)/share/tuxbox/neutrino/icons
+SHAREICONS	= $(TARGET_DIR)/share/tuxbox/neutrino/icons
-SHAREFLEX	= $(TARGETPREFIX)/share/tuxbox/neutrino/flex
+SHAREFLEX	= $(TARGET_DIR)/share/tuxbox/neutrino/flex
-SHAREPLUG	= $(TARGETPREFIX)/share/tuxbox/neutrino/plugins
+SHAREPLUG	= $(TARGET_DIR)/share/tuxbox/neutrino/plugins
-SHARETHEMES	= $(TARGETPREFIX)/share/tuxbox/neutrino/themes
+SHARETHEMES	= $(TARGET_DIR)/share/tuxbox/neutrino/themes
-SHAREWEBTV	= $(TARGETPREFIX)/share/tuxbox/neutrino/webtv
+SHAREWEBTV	= $(TARGET_DIR)/share/tuxbox/neutrino/webtv
-USRBIN		= $(TARGETPREFIX)/usr/bin
+USRBIN		= $(TARGET_DIR)/usr/bin
-VARINIT		= $(TARGETPREFIX)/var/etc/init.d
+VARINIT		= $(TARGET_DIR)/var/etc/init.d
-VARPLUG		= $(TARGETPREFIX)/var/tuxbox/plugins
+VARPLUG		= $(TARGET_DIR)/var/tuxbox/plugins
-VARCONF		= $(TARGETPREFIX)/var/tuxbox/config
+VARCONF		= $(TARGET_DIR)/var/tuxbox/config
 $(BIN) \
 $(ETCINIT) \
@ -33,7 +33,7 @@ $(SHAREWEBTV) \
 $(USRBIN) \
 $(VARINIT) \
 $(VARPLUG) \
-$(VARCONF) : | $(TARGETPREFIX)
+$(VARCONF) : | $(TARGET_DIR)
 	mkdir -p $@
 init-scripts: \
@ -104,8 +104,8 @@ channellogos: $(SOURCE_DIR)/$(NI_LOGO-STUFF) $(SHAREICONS)
 	pushd $(SOURCE_DIR)/$(NI_LOGO-STUFF)/ && \
 	./logo_linker.sh complete.db $(SHAREICONS)/logo
-lcd4linux-all: $(D)/lcd4linux | $(TARGETPREFIX)
+lcd4linux-all: $(D)/lcd4linux | $(TARGET_DIR)
-	cp -a $(IMAGEFILES)/lcd4linux/* $(TARGETPREFIX)/
+	cp -a $(IMAGEFILES)/lcd4linux/* $(TARGET_DIR)/
 emmrd: $(SHAREICONS) $(BIN)/emmrd
 $(BIN)/emmrd: $(BIN) $(VARCONF) $(ETCINIT)
@ -200,14 +200,14 @@ smarthomeinfo: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(LIBPLUG) $(VARCONF)
 	cp -a $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/$@/plugin/tuxbox/config/* $(VARCONF)/
 doscam-webif-skin: $(VARCONF)
-	mkdir -p $(TARGETPREFIX)/share/doscam/tpl/
+	mkdir -p $(TARGET_DIR)/share/doscam/tpl/
-	install -m644 $(SOURCES)/doscam-webif-skin/*.tpl $(TARGETPREFIX)/share/doscam/tpl/
+	install -m644 $(SOURCES)/doscam-webif-skin/*.tpl $(TARGET_DIR)/share/doscam/tpl/
-	mkdir -p $(TARGETPREFIX)/share/doscam/skin/
+	mkdir -p $(TARGET_DIR)/share/doscam/skin/
-	install -m644 $(SOURCES)/doscam-webif-skin/doscam_ni-dark.css $(TARGETPREFIX)/share/doscam/skin
+	install -m644 $(SOURCES)/doscam-webif-skin/doscam_ni-dark.css $(TARGET_DIR)/share/doscam/skin
 playlists:
-	mkdir -p $(TARGETPREFIX)/share/playlists/
+	mkdir -p $(TARGET_DIR)/share/playlists/
-	cp -a $(IMAGEFILES)/playlists/* $(TARGETPREFIX)/share/playlists/
+	cp -a $(IMAGEFILES)/playlists/* $(TARGET_DIR)/share/playlists/
 mountpointmanagement: $(LIBPLUG)
 	install -m755 $(SOURCES)/mountpointmanagement/*.sh $(LIBPLUG)/
@ -232,7 +232,7 @@ neutrino-mediathek: $(LIBPLUG)
 	git clone https://github.com/neutrino-mediathek/mediathek.git $(BUILD_TMP)/$@
 	pushd $(BUILD_TMP)/$@ && \
 	cp -a plugins/* $(LIBPLUG)/ && \
-	cp -a share $(TARGETPREFIX)
+	cp -a share $(TARGET_DIR)
 	$(REMOVE)/$@
 #scripts-lua
--- a/make/rootfs.mk
+++ b/make/rootfs.mk
@ -3,8 +3,8 @@
 # rootfs targets
 rootfs: .version update.urls $(BOX) cleanup strip softlinks
-.version: $(TARGETPREFIX)/.version
+.version: $(TARGET_DIR)/.version
-$(TARGETPREFIX)/.version:
+$(TARGET_DIR)/.version:
 	echo "version="$(IMAGE_TYPE)$(IMAGE_VERSION)$(IMAGE_DATE) > $@
 	# determinate last NI-release-tag an use this to git describe
 	GITTAG=`cd $(N_HD_SOURCE); git tag -l "NI-*" | tail -n1`; \
@ -26,17 +26,17 @@ else
 endif
 	echo "homepage=www.neutrino-images.de"			>> $@
-update.urls: $(TARGETPREFIX)/var/etc/update.urls
+update.urls: $(TARGET_DIR)/var/etc/update.urls
-$(TARGETPREFIX)/var/etc/update.urls:
+$(TARGET_DIR)/var/etc/update.urls:
 	rm -f $@
 	touch $@
 	echo "$(NI-SERVER)/update.php"				>> $@
 	echo "$(CHANLIST_URL)/$(CHANLIST_MD5FILE)"		>> $@
 # create filesystem for our images
-$(BOX): | $(TARGETPREFIX)
+$(BOX): | $(TARGET_DIR)
 	rm -rf $(BOX)
-	cp -a $(TARGETPREFIX) $(BOX)
+	cp -a $(TARGET_DIR) $(BOX)
 # cleanup filesystem from useless stuff
 cleanup: $(BOX)
@ -84,14 +84,14 @@ ifeq ($(DEBUG), yes)
 	@echo "*******************************************************"
 	@echo "***        Strip samba for debug image              ***"
 	@echo "*******************************************************"
-	$(TARGET)-strip $(TARGETPREFIX)/bin/smbclient
+	$(TARGET)-strip $(TARGET_DIR)/bin/smbclient
-	$(TARGET)-strip $(TARGETPREFIX)/bin/smbpasswd
+	$(TARGET)-strip $(TARGET_DIR)/bin/smbpasswd
-	$(TARGET)-strip $(TARGETPREFIX)/lib/libsmbsharemodes.so.0
+	$(TARGET)-strip $(TARGET_DIR)/lib/libsmbsharemodes.so.0
-	$(TARGET)-strip $(TARGETPREFIX)/lib/libsmbclient.so.0
+	$(TARGET)-strip $(TARGET_DIR)/lib/libsmbclient.so.0
-	$(TARGET)-strip $(TARGETPREFIX)/lib/libnetapi.so.0
+	$(TARGET)-strip $(TARGET_DIR)/lib/libnetapi.so.0
-	$(TARGET)-strip $(TARGETPREFIX)/lib/libtdb.so.1
+	$(TARGET)-strip $(TARGET_DIR)/lib/libtdb.so.1
-	$(TARGET)-strip $(TARGETPREFIX)/lib/libtalloc.so.1
+	$(TARGET)-strip $(TARGET_DIR)/lib/libtalloc.so.1
-	$(TARGET)-strip $(TARGETPREFIX)/lib/libwbclient.so.0
+	$(TARGET)-strip $(TARGET_DIR)/lib/libwbclient.so.0
 	find $(BOX)/lib/samba -type f -print0 | xargs -0 $(TARGET)-strip || true
 	@echo -e "$(TERM_YELLOW)"
 	@du -sh $(BOX)
@ -195,12 +195,12 @@ get-update-info-hd1:
 	);
 	@echo " ============================================================================== "
-personalize: | $(TARGETPREFIX)
+personalize: | $(TARGET_DIR)
 	$(call local-script,$(notdir $@),start)
 	@LOCAL_ROOT=$(LOCAL_DIR)/root; \
 	if [ $$(ls -A $$LOCAL_ROOT) ]; then \
-		cp -a -v $$LOCAL_ROOT/* $(TARGETPREFIX)/; \
+		cp -a -v $$LOCAL_ROOT/* $(TARGET_DIR)/; \
 	fi
 	$(call local-script,$(notdir $@),stop)
-PHONY += $(TARGETPREFIX)/.version $(TARGETPREFIX)/var/etc/update.urls $(BOX)
+PHONY += $(TARGET_DIR)/.version $(TARGET_DIR)/var/etc/update.urls $(BOX)
--- a/make/static.mk
+++ b/make/static.mk
@ -8,7 +8,7 @@ ifneq ($(BOXSERIES), hd51)
 endif
 cortex-strings: $(STATICLIB)/libcortex-strings.la
-$(STATICLIB)/libcortex-strings.la: $(ARCHIVE)/cortex-strings-$(CORTEX-STRINGS_VER).tar.bz2 | $(TARGETPREFIX)
+$(STATICLIB)/libcortex-strings.la: $(ARCHIVE)/cortex-strings-$(CORTEX-STRINGS_VER).tar.bz2 | $(TARGET_DIR)
 	$(UNTAR)/cortex-strings-$(CORTEX-STRINGS_VER).tar.bz2
 	pushd $(BUILD_TMP)/cortex-strings-$(CORTEX-STRINGS_VER) && \
 		./autogen.sh && \
--- a/make/system-libs-extra.mk
+++ b/make/system-libs-extra.mk
@ -4,7 +4,7 @@ LIBID3TAG_VER=0.15.1b
 $(ARCHIVE)/libid3tag-$(LIBID3TAG_VER).tar.gz:
 	$(WGET) http://downloads.sourceforge.net/project/mad/libid3tag/$(LIBID3TAG_VER)/libid3tag-$(LIBID3TAG_VER).tar.gz
-$(D)/libid3tag: $(D)/zlib $(ARCHIVE)/libid3tag-$(LIBID3TAG_VER).tar.gz | $(TARGETPREFIX)
+$(D)/libid3tag: $(D)/zlib $(ARCHIVE)/libid3tag-$(LIBID3TAG_VER).tar.gz | $(TARGET_DIR)
 	$(UNTAR)/libid3tag-$(LIBID3TAG_VER).tar.gz
 	pushd $(BUILD_TMP)/libid3tag-$(LIBID3TAG_VER) && \
 		$(PATCH)/libid3tag.diff && \
@ -12,8 +12,8 @@ $(D)/libid3tag: $(D)/zlib $(ARCHIVE)/libid3tag-$(LIBID3TAG_VER).tar.gz | $(TARGE
 			--prefix= \
 			--enable-shared=yes && \
 		$(MAKE) all && \
-		make install DESTDIR=$(TARGETPREFIX) && \
+		make install DESTDIR=$(TARGET_DIR) && \
-		sed "s!^prefix=.*!prefix=$(TARGETPREFIX)!;" id3tag.pc > $(PKG_CONFIG_PATH)/libid3tag.pc
+		sed "s!^prefix=.*!prefix=$(TARGET_DIR)!;" id3tag.pc > $(PKG_CONFIG_PATH)/libid3tag.pc
 	$(REWRITE_LIBTOOL)/libid3tag.la
 	$(REMOVE)/libid3tag-$(LIBID3TAG_VER)
 	touch $@
@ -22,7 +22,7 @@ LIBFLAC_VER=1.3.2
 $(ARCHIVE)/flac-$(LIBFLAC_VER).tar.xz:
 	$(WGET) http://prdownloads.sourceforge.net/sourceforge/flac/flac-$(LIBFLAC_VER).tar.xz
-$(D)/libFLAC: $(ARCHIVE)/flac-$(LIBFLAC_VER).tar.xz | $(TARGETPREFIX)
+$(D)/libFLAC: $(ARCHIVE)/flac-$(LIBFLAC_VER).tar.xz | $(TARGET_DIR)
 	$(UNTAR)/flac-$(LIBFLAC_VER).tar.xz
 	cp -f $(HELPERS_DIR)/new_autoconfig/* $(BUILD_TMP)/flac-$(LIBFLAC_VER)
 	set -e; cd $(BUILD_TMP)/flac-$(LIBFLAC_VER); \
@ -36,11 +36,11 @@ $(D)/libFLAC: $(ARCHIVE)/flac-$(LIBFLAC_VER).tar.xz | $(TARGETPREFIX)
 			--disable-ogg \
 			--disable-altivec; \
 		$(MAKE) all && \
-		make install DESTDIR=$(TARGETPREFIX) && \
+		make install DESTDIR=$(TARGET_DIR) && \
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/flac.pc
 	$(REWRITE_LIBTOOL)/libFLAC.la
-	rm -rf $(TARGETPREFIX)/bin/flac
+	rm -rf $(TARGET_DIR)/bin/flac
-	rm -rf $(TARGETPREFIX)/bin/metaflac
+	rm -rf $(TARGET_DIR)/bin/metaflac
 	$(REMOVE)/flac-$(LIBFLAC_VER)
 	touch $@
@ -48,7 +48,7 @@ LIBROXML_VER=2.3.0
 $(ARCHIVE)/libroxml-$(LIBROXML_VER).tar.gz:
 	$(WGET) http://download.libroxml.net/pool/v2.x/libroxml-$(LIBROXML_VER).tar.gz
-$(D)/libroxml: $(ARCHIVE)/libroxml-$(LIBROXML_VER).tar.gz | $(TARGETPREFIX)
+$(D)/libroxml: $(ARCHIVE)/libroxml-$(LIBROXML_VER).tar.gz | $(TARGET_DIR)
 	$(UNTAR)/libroxml-$(LIBROXML_VER).tar.gz
 	set -e; cd $(BUILD_TMP)/libroxml-$(LIBROXML_VER); \
 		$(CONFIGURE) \
@ -58,7 +58,7 @@ $(D)/libroxml: $(ARCHIVE)/libroxml-$(LIBROXML_VER).tar.gz | $(TARGETPREFIX)
 			--disable-xml-commit-xml-tree \
 			--disable-xml-xpath-engine \
 		$(MAKE); \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
 		$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libroxml.pc
 	$(REMOVE)/libroxml-$(LIBROXML_VER)
 	touch $@
--- a/make/system-libs.mk
+++ b/make/system-libs.mk
@ -1,6 +1,6 @@
 # makefile to build system libs
-$(D)/zlib: $(ARCHIVE)/zlib-$(ZLIB_VER).tar.gz | $(TARGETPREFIX)
+$(D)/zlib: $(ARCHIVE)/zlib-$(ZLIB_VER).tar.gz | $(TARGET_DIR)
 	$(UNTAR)/zlib-$(ZLIB_VER).tar.gz
 	cd $(BUILD_TMP)/zlib-$(ZLIB_VER) && \
 		$(PATCH)/zlib-ldflags-tests.patch && \
@ -17,12 +17,12 @@ $(D)/zlib: $(ARCHIVE)/zlib-$(ZLIB_VER).tar.gz | $(TARGETPREFIX)
 			--prefix= \
 			--shared && \
 		$(MAKE) && \
-		$(MAKE) install prefix=$(TARGETPREFIX)
+		$(MAKE) install prefix=$(TARGET_DIR)
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/zlib.pc
 	$(REMOVE)/zlib-$(ZLIB_VER)
 	touch $@
-$(D)/libfuse: $(ARCHIVE)/fuse-$(FUSE_VER).tar.gz | $(TARGETPREFIX)
+$(D)/libfuse: $(ARCHIVE)/fuse-$(FUSE_VER).tar.gz | $(TARGET_DIR)
 	$(UNTAR)/fuse-$(FUSE_VER).tar.gz
 	pushd $(BUILD_TMP)/fuse-$(FUSE_VER) && \
 		$(CONFIGURE) \
@ -36,16 +36,16 @@ $(D)/libfuse: $(ARCHIVE)/fuse-$(FUSE_VER).tar.gz | $(TARGETPREFIX)
 			--enable-lib \
 			--enable-silent-rules && \
 		$(MAKE) all && \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_LIBTOOL)/libfuse.la
 	$(REWRITE_LIBTOOL)/libulockmgr.la
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/fuse.pc
-	rm -rf $(TARGETPREFIX)/etc/udev
+	rm -rf $(TARGET_DIR)/etc/udev
-	rm -rf $(TARGETPREFIX)/etc/init.d/fuse
+	rm -rf $(TARGET_DIR)/etc/init.d/fuse
 	$(REMOVE)/fuse-$(FUSE_VER)
 	touch $@
-$(D)/libupnp: $(ARCHIVE)/libupnp-$(LIBUPNP_VER).tar.bz2 | $(TARGETPREFIX)
+$(D)/libupnp: $(ARCHIVE)/libupnp-$(LIBUPNP_VER).tar.bz2 | $(TARGET_DIR)
 	$(UNTAR)/libupnp-$(LIBUPNP_VER).tar.bz2
 	pushd $(BUILD_TMP)/libupnp-$(LIBUPNP_VER) && \
 		$(CONFIGURE) \
@ -53,7 +53,7 @@ $(D)/libupnp: $(ARCHIVE)/libupnp-$(LIBUPNP_VER).tar.bz2 | $(TARGETPREFIX)
 			--enable-shared \
 			--disable-static && \
 		$(MAKE) && \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX) && \
+		$(MAKE) install DESTDIR=$(TARGET_DIR) && \
 	$(REMOVE)/libupnp-$(LIBUPNP_VER)
 	$(REWRITE_LIBTOOL)/libixml.la
 	$(REWRITE_LIBTOOL)/libthreadutil.la
@ -61,7 +61,7 @@ $(D)/libupnp: $(ARCHIVE)/libupnp-$(LIBUPNP_VER).tar.bz2 | $(TARGETPREFIX)
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libupnp.pc
 	touch $@
-$(D)/libdvbsi: | $(TARGETPREFIX)
+$(D)/libdvbsi: | $(TARGET_DIR)
 	$(REMOVE)/libdvbsi++
 	git clone git://git.opendreambox.org/git/obi/libdvbsi++.git $(BUILD_TMP)/libdvbsi++
 	cd $(BUILD_TMP)/libdvbsi++; \
@ -73,13 +73,13 @@ $(D)/libdvbsi: | $(TARGETPREFIX)
 			--enable-silent-rules \
 			--disable-static; \
 		$(MAKE); \
-		make install DESTDIR=$(TARGETPREFIX); \
+		make install DESTDIR=$(TARGET_DIR); \
 	$(REMOVE)/libdvbsi++
 	$(REWRITE_LIBTOOL)/libdvbsi++.la
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libdvbsi++.pc
 	touch $@
-$(D)/giflib: $(ARCHIVE)/giflib-$(GIFLIB_VER).tar.bz2 | $(TARGETPREFIX)
+$(D)/giflib: $(ARCHIVE)/giflib-$(GIFLIB_VER).tar.bz2 | $(TARGET_DIR)
 	$(UNTAR)/giflib-$(GIFLIB_VER).tar.bz2
 	pushd $(BUILD_TMP)/giflib-$(GIFLIB_VER) && \
 		export ac_cv_prog_have_xmlto=no && \
@ -89,7 +89,7 @@ $(D)/giflib: $(ARCHIVE)/giflib-$(GIFLIB_VER).tar.bz2 | $(TARGETPREFIX)
 			--enable-shared \
 			--bindir=/.remove && \
 		$(MAKE) all && \
-		make install DESTDIR=$(TARGETPREFIX)
+		make install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_LIBTOOL)/libgif.la
 	$(REMOVE)/giflib-$(GIFLIB_VER)
 	touch $@
@ -99,7 +99,7 @@ ifeq ($(BOXSERIES), hd1)
 	CURL_IPV6="--disable-ipv6"
 endif
-$(D)/libcurl: $(D)/zlib $(D)/openssl $(D)/librtmp $(D)/ca-bundle $(ARCHIVE)/curl-$(LIBCURL_VER).tar.bz2 | $(TARGETPREFIX)
+$(D)/libcurl: $(D)/zlib $(D)/openssl $(D)/librtmp $(D)/ca-bundle $(ARCHIVE)/curl-$(LIBCURL_VER).tar.bz2 | $(TARGET_DIR)
 	$(UNTAR)/curl-$(LIBCURL_VER).tar.bz2
 	pushd $(BUILD_TMP)/curl-$(LIBCURL_VER) && \
 		$(CONFIGURE) \
@ -124,16 +124,16 @@ $(D)/libcurl: $(D)/zlib $(D)/openssl $(D)/librtmp $(D)/ca-bundle $(ARCHIVE)/curl
 			--without-libidn \
 			--with-ca-bundle=$(CA_BUNDLE_DIR)/$(CA_BUNDLE) \
 			--with-random=/dev/urandom \
-			--with-ssl=$(TARGETPREFIX) \
+			--with-ssl=$(TARGET_DIR) \
-			--with-librtmp=$(TARGETPREFIX)/lib \
+			--with-librtmp=$(TARGET_DIR)/lib \
 			$(CURL_IPV6) \
 			--enable-optimize && \
 		$(MAKE) all && \
 		mkdir -p $(HOST_DIR)/bin && \
-		sed -e "s,^prefix=,prefix=$(TARGETPREFIX)," < curl-config > $(HOST_DIR)/bin/curl-config && \
+		sed -e "s,^prefix=,prefix=$(TARGET_DIR)," < curl-config > $(HOST_DIR)/bin/curl-config && \
 		chmod 755 $(HOST_DIR)/bin/curl-config && \
-		make install DESTDIR=$(TARGETPREFIX)
+		make install DESTDIR=$(TARGET_DIR)
-	rm -rf $(TARGETPREFIX)/bin/curl-config $(TARGETPREFIX)/share/zsh
+	rm -rf $(TARGET_DIR)/bin/curl-config $(TARGET_DIR)/share/zsh
 	$(REWRITE_LIBTOOL)/libcurl.la
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libcurl.pc
 	$(REMOVE)/curl-$(LIBCURL_VER)
@ -144,12 +144,12 @@ ifneq ($(BOXSERIES), hd51)
 	LIBPNG_CONF = --disable-arm-neon
 endif
-$(D)/libpng: $(ARCHIVE)/libpng-$(LIBPNG_VER).tar.xz $(D)/zlib | $(TARGETPREFIX)
+$(D)/libpng: $(ARCHIVE)/libpng-$(LIBPNG_VER).tar.xz $(D)/zlib | $(TARGET_DIR)
 	$(UNTAR)/libpng-$(LIBPNG_VER).tar.xz
 	pushd $(BUILD_TMP)/libpng-$(LIBPNG_VER) && \
 		$(PATCH)/libpng-Disable-pngfix-and-png-fix-itxt.patch && \
 		$(CONFIGURE) \
-			--prefix=$(TARGETPREFIX) \
+			--prefix=$(TARGET_DIR) \
 			--bindir=$(HOST_DIR)/bin \
 			--mandir=$(BUILD_TMP)/.remove \
 			--enable-silent-rules \
@ -160,7 +160,7 @@ $(D)/libpng: $(ARCHIVE)/libpng-$(LIBPNG_VER).tar.xz $(D)/zlib | $(TARGETPREFIX)
 	$(REMOVE)/libpng-$(LIBPNG_VER)
 	touch $@
-$(D)/freetype: $(D)/zlib $(D)/libpng $(ARCHIVE)/freetype-$(FREETYPE_VER).tar.bz2 | $(TARGETPREFIX)
+$(D)/freetype: $(D)/zlib $(D)/libpng $(ARCHIVE)/freetype-$(FREETYPE_VER).tar.bz2 | $(TARGET_DIR)
 	$(UNTAR)/freetype-$(FREETYPE_VER).tar.bz2
 	pushd $(BUILD_TMP)/freetype-$(FREETYPE_VER) && \
 		$(PATCH)/freetype2_subpixel.patch; \
@ -171,7 +171,7 @@ $(D)/freetype: $(D)/zlib $(D)/libpng $(ARCHIVE)/freetype-$(FREETYPE_VER).tar.bz2
 		autoconf
 	pushd $(BUILD_TMP)/freetype-$(FREETYPE_VER) && \
 		$(CONFIGURE) \
-			--prefix=$(TARGETPREFIX) \
+			--prefix=$(TARGET_DIR) \
 			--mandir=$(BUILD_TMP)/.remove \
 			--enable-shared \
 			--with-png \
@ -182,11 +182,11 @@ $(D)/freetype: $(D)/zlib $(D)/libpng $(ARCHIVE)/freetype-$(FREETYPE_VER).tar.bz2
 		$(MAKE) all && \
 		make install && \
 		ln -sf ./freetype2/freetype $(TARGETINCLUDE)/freetype && \
-	mv $(TARGETPREFIX)/bin/freetype-config $(HOST_DIR)/bin/freetype-config
+	mv $(TARGET_DIR)/bin/freetype-config $(HOST_DIR)/bin/freetype-config
-	$(REMOVE)/freetype-$(FREETYPE_VER) $(TARGETPREFIX)/share/aclocal
+	$(REMOVE)/freetype-$(FREETYPE_VER) $(TARGET_DIR)/share/aclocal
 	touch $@
-$(D)/libjpeg: $(ARCHIVE)/libjpeg-turbo-$(LIBJPEG-TURBO_VER).tar.gz | $(TARGETPREFIX)
+$(D)/libjpeg: $(ARCHIVE)/libjpeg-turbo-$(LIBJPEG-TURBO_VER).tar.gz | $(TARGET_DIR)
 	$(UNTAR)/libjpeg-turbo-$(LIBJPEG-TURBO_VER).tar.gz
 	cd $(BUILD_TMP)/libjpeg-turbo-$(LIBJPEG-TURBO_VER) && \
 		export CC=$(TARGET)-gcc && \
@ -199,7 +199,7 @@ $(D)/libjpeg: $(ARCHIVE)/libjpeg-turbo-$(LIBJPEG-TURBO_VER).tar.gz | $(TARGETPRE
 			--datarootdir=/.remove \
 			--disable-static && \
 		$(MAKE)  && \
-		make install DESTDIR=$(TARGETPREFIX)
+		make install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_LIBTOOL)/libjpeg.la
 	rm -f $(TARGETLIB)/libturbojpeg* $(TARGETINCLUDE)/turbojpeg.h
 	$(REMOVE)/libjpeg-turbo-$(LIBJPEG-TURBO_VER)
@ -213,7 +213,7 @@ OPENSSLFLAGS = CC=$(TARGET)-gcc \
 		NI_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \
 		PROCESSOR=ARM
-$(D)/openssl: $(ARCHIVE)/openssl-$(OPENSSL_VER).tar.gz | $(TARGETPREFIX)
+$(D)/openssl: $(ARCHIVE)/openssl-$(OPENSSL_VER).tar.gz | $(TARGET_DIR)
 	$(UNTAR)/openssl-$(OPENSSL_VER).tar.gz
 	pushd $(BUILD_TMP)/openssl-$(OPENSSL_VER) && \
 	$(PATCH)/openssl-add-ni-specific-target.patch && \
@ -233,13 +233,13 @@ $(D)/openssl: $(ARCHIVE)/openssl-$(OPENSSL_VER).tar.gz | $(TARGETPREFIX)
 		make $(OPENSSLFLAGS) depend && \
 		sed -i "s# build_tests##" Makefile && \
 		make $(OPENSSLFLAGS) all && \
-		make install_sw INSTALL_PREFIX=$(TARGETPREFIX)
+		make install_sw INSTALL_PREFIX=$(TARGET_DIR)
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/openssl.pc
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libcrypto.pc
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libssl.pc
-	rm -rf $(TARGETPREFIX)/bin/c_rehash $(TARGETLIB)/engines
+	rm -rf $(TARGET_DIR)/bin/c_rehash $(TARGETLIB)/engines
 ifneq ($(BOXSERIES), hd51)
-	rm -rf $(TARGETPREFIX)/bin/openssl
+	rm -rf $(TARGET_DIR)/bin/openssl
 endif
 	$(REMOVE)/openssl-$(OPENSSL_VER)
 	chmod 0755 $(TARGETLIB)/libcrypto.so.* $(TARGETLIB)/libssl.so.*
@ -407,7 +407,7 @@ ifeq ($(BOXSERIES), hd51)
 			--extra-cflags="-Wno-deprecated-declarations -I$(TARGETINCLUDE) -mfpu=neon-vfpv4 -mfloat-abi=hard"
 endif
-$(D)/ffmpeg: $(FFMPEG_DEPS) | $(TARGETPREFIX)
+$(D)/ffmpeg: $(FFMPEG_DEPS) | $(TARGET_DIR)
 	$(REMOVE)/$(NI_FFMPEG)
 	cd $(SOURCE_DIR)/$(NI_FFMPEG) && \
 		git checkout $(NI_FFMPEG_BRANCH) && \
@ -418,7 +418,7 @@ $(D)/ffmpeg: $(FFMPEG_DEPS) | $(TARGETPREFIX)
 			$(FFMPEG_CONFIGURE) \
 			$(FFMPEG_CONFIGURE_VER); \
 		$(MAKE); \
-		make install DESTDIR=$(TARGETPREFIX)
+		make install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavcodec.pc
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavdevice.pc
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavfilter.pc
@ -428,7 +428,7 @@ $(D)/ffmpeg: $(FFMPEG_DEPS) | $(TARGETPREFIX)
 	$(REMOVE)/$(NI_FFMPEG)
 	touch $@
-$(D)/libncurses: $(ARCHIVE)/ncurses-$(LIBNCURSES_VER).tar.gz | $(TARGETPREFIX)
+$(D)/libncurses: $(ARCHIVE)/ncurses-$(LIBNCURSES_VER).tar.gz | $(TARGET_DIR)
 	$(UNTAR)/ncurses-$(LIBNCURSES_VER).tar.gz && \
 	pushd $(BUILD_TMP)/ncurses-$(LIBNCURSES_VER) && \
 	$(PATCH)/ncurses-gcc-5.x-MKlib_gen.patch && \
@ -449,11 +449,11 @@ $(D)/libncurses: $(ARCHIVE)/ncurses-$(LIBNCURSES_VER).tar.gz | $(TARGETPREFIX)
 			--without-profile \
 			--without-cxx-binding && \
 		$(MAKE) libs && \
-		$(MAKE) install.libs DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install.libs DESTDIR=$(TARGET_DIR)
 	rm -rf $(HOST_DIR)/bin/ncurses*
 	rm -rf $(TARGETLIB)/libform* $(TARGETLIB)/libmenu* $(TARGETLIB)/libpanel*
 	rm -rf $(PKG_CONFIG_PATH)/form.pc $(PKG_CONFIG_PATH)/menu.pc $(PKG_CONFIG_PATH)/panel.pc
-	mv $(TARGETPREFIX)/bin/ncurses6-config $(HOST_DIR)/bin
+	mv $(TARGET_DIR)/bin/ncurses6-config $(HOST_DIR)/bin
 	$(REWRITE_PKGCONF) $(HOST_DIR)/bin/ncurses6-config
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/ncurses.pc
 	ln -sf ./ncurses/curses.h $(TARGETINCLUDE)/curses.h
@ -462,7 +462,7 @@ $(D)/libncurses: $(ARCHIVE)/ncurses-$(LIBNCURSES_VER).tar.gz | $(TARGETPREFIX)
 	$(REMOVE)/ncurses-$(LIBNCURSES_VER)
 	touch $@
-$(D)/openthreads: $(SOURCE_DIR)/$(NI_OPENTHREADS) | $(TARGETPREFIX)
+$(D)/openthreads: $(SOURCE_DIR)/$(NI_OPENTHREADS) | $(TARGET_DIR)
 	$(REMOVE)/$(NI_OPENTHREADS)
 	tar -C $(SOURCE_DIR) -cp $(NI_OPENTHREADS) --exclude-vcs | tar -C $(BUILD_TMP) -x
 	cd $(BUILD_TMP)/$(NI_OPENTHREADS)/ && \
@ -484,40 +484,40 @@ $(D)/openthreads: $(SOURCE_DIR)/$(NI_OPENTHREADS) | $(TARGETPREFIX)
 			-DCMAKE_SUPPRESS_DEVELOPER_WARNINGS="1" \
 			-D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE="0" && \
 		$(MAKE) && \
-		make install DESTDIR=$(TARGETPREFIX)
+		make install DESTDIR=$(TARGET_DIR)
 		$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/openthreads.pc
 	$(REMOVE)/$(NI_OPENTHREADS)
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/openthreads.pc
 	touch $@
-$(D)/libusb: $(ARCHIVE)/libusb-$(LIBUSB_VER).tar.bz2 | $(TARGETPREFIX)
+$(D)/libusb: $(ARCHIVE)/libusb-$(LIBUSB_VER).tar.bz2 | $(TARGET_DIR)
 	$(UNTAR)/libusb-$(LIBUSB_VER).tar.bz2
 	pushd $(BUILD_TMP)/libusb-$(LIBUSB_VER) && \
 		$(CONFIGURE) \
 			--prefix= \
 			--disable-udev && \
 		$(MAKE) && \
-		make install DESTDIR=$(TARGETPREFIX) && \
+		make install DESTDIR=$(TARGET_DIR) && \
 	$(REMOVE)/libusb-$(LIBUSB_VER)
 	$(REWRITE_LIBTOOL)/libusb-$(LIBUSB_MAJ).la
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libusb-$(LIBUSB_MAJ).pc
 	touch $@
-$(D)/libusb_compat: $(ARCHIVE)/libusb-compat-$(LIBUSB_COMPAT_VER).tar.bz2 $(D)/libusb | $(TARGETPREFIX)
+$(D)/libusb_compat: $(ARCHIVE)/libusb-compat-$(LIBUSB_COMPAT_VER).tar.bz2 $(D)/libusb | $(TARGET_DIR)
 	$(UNTAR)/libusb-compat-$(LIBUSB_COMPAT_VER).tar.bz2
 	pushd $(BUILD_TMP)/libusb-compat-$(LIBUSB_COMPAT_VER) && \
 		$(CONFIGURE) \
 			--prefix= && \
 		$(MAKE) && \
-		make install DESTDIR=$(TARGETPREFIX) && \
+		make install DESTDIR=$(TARGET_DIR) && \
 	$(REMOVE)/libusb-compat-$(LIBUSB_COMPAT_VER)
-	mv $(TARGETPREFIX)/bin/libusb-config $(HOST_DIR)/bin
+	mv $(TARGET_DIR)/bin/libusb-config $(HOST_DIR)/bin
 	$(REWRITE_PKGCONF) $(HOST_DIR)/bin/libusb-config
 	$(REWRITE_LIBTOOL)/libusb.la
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libusb.pc
 	touch $@
-$(D)/libgd2: $(D)/zlib $(D)/libpng $(D)/libjpeg $(D)/freetype $(ARCHIVE)/libgd-$(LIBGD_VER).tar.xz | $(TARGETPREFIX)
+$(D)/libgd2: $(D)/zlib $(D)/libpng $(D)/libjpeg $(D)/freetype $(ARCHIVE)/libgd-$(LIBGD_VER).tar.xz | $(TARGET_DIR)
 	$(UNTAR)/libgd-$(LIBGD_VER).tar.xz
 	pushd $(BUILD_TMP)/libgd-$(LIBGD_VER) && \
 		./bootstrap.sh && \
@ -528,7 +528,7 @@ $(D)/libgd2: $(D)/zlib $(D)/libpng $(D)/libjpeg $(D)/freetype $(ARCHIVE)/libgd-$
 			--without-xpm \
 			--without-x && \
 		$(MAKE) && \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REMOVE)/libgd-$(LIBGD_VER)
 	$(REWRITE_LIBTOOL)/libgd.la
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gdlib.pc
@ -541,11 +541,11 @@ $(ARCHIVE)/dpf-ax_svn$(DPF-AX_REV).tar.gz:
 		tar cvpzf $@ dpf-ax_svn$(DPF-AX_REV)
 	$(REMOVE)/dpf-ax_svn$(DPF-AX_REV)
-$(D)/libdpf: $(D)/libusb_compat $(ARCHIVE)/dpf-ax_svn$(DPF-AX_REV).tar.gz | $(TARGETPREFIX)
+$(D)/libdpf: $(D)/libusb_compat $(ARCHIVE)/dpf-ax_svn$(DPF-AX_REV).tar.gz | $(TARGET_DIR)
 	$(UNTAR)/dpf-ax_svn$(DPF-AX_REV).tar.gz
 	cd $(BUILD_TMP)/dpf-ax_svn$(DPF-AX_REV)/dpflib && \
 		$(PATCH)/libdpf-crossbuild.diff; \
-		make libdpf.a CC=$(TARGET)-gcc PREFIX=$(TARGETPREFIX); \
+		make libdpf.a CC=$(TARGET)-gcc PREFIX=$(TARGET_DIR); \
 		mkdir -p $(TARGETINCLUDE)/libdpf; \
 		cp dpf.h $(TARGETINCLUDE)/libdpf/libdpf.h; \
 		cp ../include/spiflash.h $(TARGETINCLUDE)/libdpf/; \
@ -554,7 +554,7 @@ $(D)/libdpf: $(D)/libusb_compat $(ARCHIVE)/dpf-ax_svn$(DPF-AX_REV).tar.gz | $(TA
 	$(REMOVE)/dpf-ax_svn$(DPF-AX_REV)
 	touch $@
-$(D)/lzo: $(ARCHIVE)/lzo-$(LZO_VER).tar.gz | $(TARGETPREFIX)
+$(D)/lzo: $(ARCHIVE)/lzo-$(LZO_VER).tar.gz | $(TARGET_DIR)
 	$(UNTAR)/lzo-$(LZO_VER).tar.gz
 	cd $(BUILD_TMP)/lzo-$(LZO_VER) && \
 		$(CONFIGURE) \
@ -562,12 +562,12 @@ $(D)/lzo: $(ARCHIVE)/lzo-$(LZO_VER).tar.gz | $(TARGETPREFIX)
 			--docdir=/.remove \
 			--prefix= && \
 		$(MAKE) && \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_LIBTOOL)/liblzo2.la
 	$(REMOVE)/lzo-$(LZO_VER)
 	touch $@
-$(D)/libsigc++: $(ARCHIVE)/libsigc++-$(LIBSIGCPP_VER).tar.xz | $(TARGETPREFIX)
+$(D)/libsigc++: $(ARCHIVE)/libsigc++-$(LIBSIGCPP_VER).tar.xz | $(TARGET_DIR)
 	$(UNTAR)/libsigc++-$(LIBSIGCPP_VER).tar.xz
 	set -e; cd $(BUILD_TMP)/libsigc++-$(LIBSIGCPP_VER); \
 		$(CONFIGURE) \
@ -575,7 +575,7 @@ $(D)/libsigc++: $(ARCHIVE)/libsigc++-$(LIBSIGCPP_VER).tar.xz | $(TARGETPREFIX)
 			--disable-documentation \
 			--enable-silent-rules; \
 		$(MAKE); \
-		make install DESTDIR=$(TARGETPREFIX); \
+		make install DESTDIR=$(TARGET_DIR); \
 	ln -sf ./sigc++-2.0/sigc++ $(TARGETINCLUDE)/sigc++
 	cp $(BUILD_TMP)/libsigc++-$(LIBSIGCPP_VER)/sigc++config.h $(TARGETINCLUDE)
 	$(REWRITE_LIBTOOL)/libsigc-2.0.la
@ -583,7 +583,7 @@ $(D)/libsigc++: $(ARCHIVE)/libsigc++-$(LIBSIGCPP_VER).tar.xz | $(TARGETPREFIX)
 	$(REMOVE)/libsigc++-$(LIBSIGCPP_VER)
 	touch $@
-$(D)/expat: $(ARCHIVE)/expat-$(EXPAT_VER).tar.gz | $(TARGETPREFIX)
+$(D)/expat: $(ARCHIVE)/expat-$(EXPAT_VER).tar.gz | $(TARGET_DIR)
 	$(UNTAR)/expat-$(EXPAT_VER).tar.gz
 	set -e; cd $(BUILD_TMP)/expat-$(EXPAT_VER); \
 		$(CONFIGURE) \
@ -592,13 +592,13 @@ $(D)/expat: $(ARCHIVE)/expat-$(EXPAT_VER).tar.gz | $(TARGETPREFIX)
 			--enable-shared \
 			--disable-static; \
 		$(MAKE); \
-		make install DESTDIR=$(TARGETPREFIX)
+		make install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/expat.pc
 	$(REWRITE_LIBTOOL)/libexpat.la
 	$(REMOVE)/expat-$(EXPAT_VER)
 	touch $@
-$(D)/luaexpat: $(ARCHIVE)/luaexpat-$(LUA_EXPAT_VER).tar.gz $(D)/expat | $(TARGETPREFIX)
+$(D)/luaexpat: $(ARCHIVE)/luaexpat-$(LUA_EXPAT_VER).tar.gz $(D)/expat | $(TARGET_DIR)
 	$(UNTAR)/luaexpat-$(LUA_EXPAT_VER).tar.gz
 	set -e; cd $(BUILD_TMP)/luaexpat-$(LUA_EXPAT_VER); \
 		rm makefile*; \
@ -608,12 +608,12 @@ $(D)/luaexpat: $(ARCHIVE)/luaexpat-$(LUA_EXPAT_VER).tar.gz $(D)/expat | $(TARGET
 		$(MAKE) \
 		CC=$(TARGET)-gcc LUA_V=$(LUA_ABIVER) LDFLAGS="$(TARGET_LDFLAGS)" \
 		LUA_INC=-I$(TARGETINCLUDE) EXPAT_INC=-I$(TARGETINCLUDE); \
-		$(MAKE) install LUA_LDIR=$(TARGETPREFIX)/share/lua/$(LUA_ABIVER) LUA_CDIR=$(TARGETLIB)/lua/$(LUA_ABIVER)
+		$(MAKE) install LUA_LDIR=$(TARGET_DIR)/share/lua/$(LUA_ABIVER) LUA_CDIR=$(TARGETLIB)/lua/$(LUA_ABIVER)
-	rm -rf $(TARGETPREFIX)/share/lua/$(LUA_ABIVER)/lxp/tests
+	rm -rf $(TARGET_DIR)/share/lua/$(LUA_ABIVER)/lxp/tests
 	$(REMOVE)/luaexpat-$(LUA_EXPAT_VER)
 	touch $@
-$(D)/luacurl: $(D)/libcurl $(D)/lua $(ARCHIVE)/Lua-cURL$(LUACURL_VER).tar.xz | $(TARGETPREFIX)
+$(D)/luacurl: $(D)/libcurl $(D)/lua $(ARCHIVE)/Lua-cURL$(LUACURL_VER).tar.xz | $(TARGET_DIR)
 	$(UNTAR)/Lua-cURL$(LUACURL_VER).tar.xz
 	set -e; cd $(BUILD_TMP)/Lua-cURL$(LUACURL_VER); \
 		$(PATCH)/lua-curl-Makefile.diff; \
@ -627,12 +627,12 @@ $(D)/luacurl: $(D)/libcurl $(D)/lua $(ARCHIVE)/Lua-cURL$(LUACURL_VER).tar.xz | $
 			$(MAKE); \
 			LUA_CMOD=/lib/lua/$(LUA_ABIVER) \
 			LUA_LMOD=/share/lua/$(LUA_ABIVER) \
-			DESTDIR=$(TARGETPREFIX) \
+			DESTDIR=$(TARGET_DIR) \
 			$(MAKE) install
 	$(REMOVE)/Lua-cURL$(LUACURL_VER)
 	touch $@
-$(D)/luaposix: $(HOST_DIR)/bin/lua-$(LUA_VER) $(D)/lua $(D)/luaexpat $(ARCHIVE)/v$(LUAPOSIX_VER).tar.gz $(ARCHIVE)/v$(SLINGSHOT_VER).tar.gz $(ARCHIVE)/gnulib-$(GNULIB_VER)-stable.tar.gz | $(TARGETPREFIX)
+$(D)/luaposix: $(HOST_DIR)/bin/lua-$(LUA_VER) $(D)/lua $(D)/luaexpat $(ARCHIVE)/v$(LUAPOSIX_VER).tar.gz $(ARCHIVE)/v$(SLINGSHOT_VER).tar.gz $(ARCHIVE)/gnulib-$(GNULIB_VER)-stable.tar.gz | $(TARGET_DIR)
 	$(UNTAR)/v$(LUAPOSIX_VER).tar.gz
 	tar -C $(BUILD_TMP)/luaposix-$(LUAPOSIX_VER)/slingshot --strip=1 -xf $(ARCHIVE)/v$(SLINGSHOT_VER).tar.gz
 	tar -C $(BUILD_TMP)/luaposix-$(LUAPOSIX_VER)/gnulib --strip=1 -xf $(ARCHIVE)/gnulib-$(GNULIB_VER)-stable.tar.gz
@ -646,28 +646,28 @@ $(D)/luaposix: $(HOST_DIR)/bin/lua-$(LUA_VER) $(D)/lua $(D)/luaexpat $(ARCHIVE)/
 			--prefix= \
 			--exec-prefix= \
 			--libdir=$(TARGETLIB)/lua/$(LUA_ABIVER) \
-			--datarootdir=$(TARGETPREFIX)/share/lua/$(LUA_ABIVER) \
+			--datarootdir=$(TARGET_DIR)/share/lua/$(LUA_ABIVER) \
-			--mandir=$(TARGETPREFIX)/.remove \
+			--mandir=$(TARGET_DIR)/.remove \
-			--docdir=$(TARGETPREFIX)/.remove \
+			--docdir=$(TARGET_DIR)/.remove \
 			--enable-silent-rules; \
 		$(MAKE); \
 		$(MAKE) all check install
-	$(REMOVE)/luaposix-$(LUAPOSIX_VER) $(TARGETPREFIX)/.remove
+	$(REMOVE)/luaposix-$(LUAPOSIX_VER) $(TARGET_DIR)/.remove
 	touch $@
 # helper for luaposix build
-$(HOST_DIR)/bin/lua-$(LUA_VER): $(ARCHIVE)/lua-$(LUA_VER).tar.gz | $(TARGETPREFIX)
+$(HOST_DIR)/bin/lua-$(LUA_VER): $(ARCHIVE)/lua-$(LUA_VER).tar.gz | $(TARGET_DIR)
 	$(UNTAR)/lua-$(LUA_VER).tar.gz
 	set -e; cd $(BUILD_TMP)/lua-$(LUA_VER); \
 		$(PATCH)/lua-01-fix-coolstream-build.patch; \
 		$(MAKE) linux
 	install -m 0755 -D $(BUILD_TMP)/lua-$(LUA_VER)/src/lua $@
-	$(REMOVE)/lua-$(LUA_VER) $(TARGETPREFIX)/.remove
+	$(REMOVE)/lua-$(LUA_VER) $(TARGET_DIR)/.remove
-lua-libs: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) | $(TARGETPREFIX)
+lua-libs: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) | $(TARGET_DIR)
-	cp -a $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/share/lua/5.2/* $(TARGETPREFIX)/share/lua/$(LUA_ABIVER)/
+	cp -a $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/share/lua/5.2/* $(TARGET_DIR)/share/lua/$(LUA_ABIVER)/
-$(D)/lua: $(D)/libncurses $(ARCHIVE)/lua-$(LUA_VER).tar.gz | $(TARGETPREFIX)
+$(D)/lua: $(D)/libncurses $(ARCHIVE)/lua-$(LUA_VER).tar.gz | $(TARGET_DIR)
 	$(UNTAR)/lua-$(LUA_VER).tar.gz
 	set -e; cd $(BUILD_TMP)/lua-$(LUA_VER); \
 		$(PATCH)/lua-01-fix-coolstream-build.patch; \
@ -677,13 +677,13 @@ $(D)/lua: $(D)/libncurses $(ARCHIVE)/lua-$(LUA_VER).tar.gz | $(TARGETPREFIX)
 		sed -i 's/^V=.*/V= $(LUA_ABIVER)/' etc/lua.pc; \
 		sed -i 's/^R=.*/R= $(LUA_VER)/' etc/lua.pc; \
 		$(MAKE) linux PKG_VERSION=$(LUA_VER) CC=$(TARGET)-gcc LD=$(TARGET)-ld AR="$(TARGET)-ar rcu" RANLIB=$(TARGET)-ranlib LDFLAGS="$(TARGET_LDFLAGS)"; \
-		$(MAKE) install INSTALL_TOP=$(TARGETPREFIX)
+		$(MAKE) install INSTALL_TOP=$(TARGET_DIR)
 	install -m 0755 -D $(BUILD_TMP)/lua-$(LUA_VER)/src/liblua.so.$(LUA_VER) $(TARGETLIB)/liblua.so.$(LUA_VER)
 	cd $(TARGETLIB); ln -sf liblua.so.$(LUA_VER) $(TARGETLIB)/liblua.so
 	install -m 0644 -D $(BUILD_TMP)/lua-$(LUA_VER)/etc/lua.pc $(PKG_CONFIG_PATH)/lua.pc
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/lua.pc
-	rm -rf $(TARGETPREFIX)/bin/luac
+	rm -rf $(TARGET_DIR)/bin/luac
-	$(REMOVE)/lua-$(LUA_VER) $(TARGETPREFIX)/.remove
+	$(REMOVE)/lua-$(LUA_VER) $(TARGET_DIR)/.remove
 	make lua-libs
 	touch $@
@ -691,7 +691,7 @@ BLURAY_DEPS = $(D)/freetype
 ifeq ($(BOXSERIES), hd2)
  BLURAY_DEPS += $(D)/libaacs $(D)/libbdplus
 endif
-$(D)/libbluray: $(BLURAY_DEPS) $(ARCHIVE)/libbluray-$(LIBBLURAY_VER).tar.bz2 | $(TARGETPREFIX)
+$(D)/libbluray: $(BLURAY_DEPS) $(ARCHIVE)/libbluray-$(LIBBLURAY_VER).tar.bz2 | $(TARGET_DIR)
 	$(REMOVE)/libbluray-$(LIBBLURAY_VER)
 	$(UNTAR)/libbluray-$(LIBBLURAY_VER).tar.bz2
 	cd $(BUILD_TMP)/libbluray-$(LIBBLURAY_VER) && \
@ -713,13 +713,13 @@ $(D)/libbluray: $(BLURAY_DEPS) $(ARCHIVE)/libbluray-$(LIBBLURAY_VER).tar.bz2 | $
 			--without-fontconfig \
 			$(BLURAY_CONFIGURE) && \
 		$(MAKE) && \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
 		$(REWRITE_LIBTOOL)/libbluray.la
 		$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libbluray.pc
 	$(REMOVE)/libbluray-$(LIBBLURAY_VER)
 	touch $@
-$(D)/libass: $(D)/freetype $(D)/libfribidi $(ARCHIVE)/libass-$(LIBASS_VER).tar.xz | $(TARGETPREFIX)
+$(D)/libass: $(D)/freetype $(D)/libfribidi $(ARCHIVE)/libass-$(LIBASS_VER).tar.xz | $(TARGET_DIR)
 	$(UNTAR)/libass-$(LIBASS_VER).tar.xz
 	pushd $(BUILD_TMP)/libass-$(LIBASS_VER) && \
 		$(CONFIGURE) \
@ -731,13 +731,13 @@ $(D)/libass: $(D)/freetype $(D)/libfribidi $(ARCHIVE)/libass-$(LIBASS_VER).tar.x
 			--disable-harfbuzz \
 			--disable-require-system-font-provider && \
 		$(MAKE) && \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REMOVE)/libass-$(LIBASS_VER)
 	$(REWRITE_LIBTOOL)/libass.la
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libass.pc
 	touch $@
-$(D)/libgpg-error: $(ARCHIVE)/libgpg-error-$(LIBGPG-ERROR_VER).tar.bz2 | $(TARGETPREFIX)
+$(D)/libgpg-error: $(ARCHIVE)/libgpg-error-$(LIBGPG-ERROR_VER).tar.bz2 | $(TARGET_DIR)
 	$(UNTAR)/libgpg-error-$(LIBGPG-ERROR_VER).tar.bz2
 	pushd $(BUILD_TMP)/libgpg-error-$(LIBGPG-ERROR_VER) && \
 		pushd src/syscfg && \
@ -752,16 +752,16 @@ $(D)/libgpg-error: $(ARCHIVE)/libgpg-error-$(LIBGPG-ERROR_VER).tar.bz2 | $(TARGE
 			--enable-shared \
 			--disable-static && \
 		$(MAKE) && \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	mv $(TARGETPREFIX)/bin/gpg-error-config $(HOST_DIR)/bin
+	mv $(TARGET_DIR)/bin/gpg-error-config $(HOST_DIR)/bin
 	$(REWRITE_PKGCONF) $(HOST_DIR)/bin/gpg-error-config
 	$(REWRITE_LIBTOOL)/libgpg-error.la
-	rm -rf $(TARGETPREFIX)/bin/gpg-error
+	rm -rf $(TARGET_DIR)/bin/gpg-error
-	rm -rf $(TARGETPREFIX)/share/common-lisp
+	rm -rf $(TARGET_DIR)/share/common-lisp
 	$(REMOVE)/libgpg-error-$(LIBGPG-ERROR_VER)
 	touch $@
-$(D)/libgcrypt: $(ARCHIVE)/libgcrypt-$(LIBGCRYPT_VER).tar.gz $(D)/libgpg-error | $(TARGETPREFIX)
+$(D)/libgcrypt: $(ARCHIVE)/libgcrypt-$(LIBGCRYPT_VER).tar.gz $(D)/libgpg-error | $(TARGET_DIR)
 	$(UNTAR)/libgcrypt-$(LIBGCRYPT_VER).tar.gz
 	pushd $(BUILD_TMP)/libgcrypt-$(LIBGCRYPT_VER) && \
 		$(CONFIGURE) \
@ -774,17 +774,17 @@ $(D)/libgcrypt: $(ARCHIVE)/libgcrypt-$(LIBGCRYPT_VER).tar.gz $(D)/libgpg-error |
 			--enable-shared \
 			--disable-static && \
 		$(MAKE) && \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	mv $(TARGETPREFIX)/bin/libgcrypt-config $(HOST_DIR)/bin
+	mv $(TARGET_DIR)/bin/libgcrypt-config $(HOST_DIR)/bin
 	$(REWRITE_PKGCONF) $(HOST_DIR)/bin/libgcrypt-config
 	$(REWRITE_LIBTOOL)/libgcrypt.la
-	rm -rf $(TARGETPREFIX)/bin/dumpsexp
+	rm -rf $(TARGET_DIR)/bin/dumpsexp
-	rm -rf $(TARGETPREFIX)/bin/hmac256
+	rm -rf $(TARGET_DIR)/bin/hmac256
-	rm -rf $(TARGETPREFIX)/bin/mpicalc
+	rm -rf $(TARGET_DIR)/bin/mpicalc
 	$(REMOVE)/libgcrypt-$(LIBGCRYPT_VER)
 	touch $@
-$(D)/libaacs: $(ARCHIVE)/libaacs-$(LIBAACS_VER).tar.bz2 $(D)/libgcrypt | $(TARGETPREFIX)
+$(D)/libaacs: $(ARCHIVE)/libaacs-$(LIBAACS_VER).tar.bz2 $(D)/libgcrypt | $(TARGET_DIR)
 	$(UNTAR)/libaacs-$(LIBAACS_VER).tar.bz2
 	pushd $(BUILD_TMP)/libaacs-$(LIBAACS_VER) && \
 		./bootstrap && \
@ -795,16 +795,16 @@ $(D)/libaacs: $(ARCHIVE)/libaacs-$(LIBAACS_VER).tar.bz2 $(D)/libgcrypt | $(TARGE
 			--enable-shared \
 			--disable-static && \
 		$(MAKE) && \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libaacs.pc
 	$(REWRITE_LIBTOOL)/libaacs.la
 	$(REMOVE)/libaacs-$(LIBAACS_VER)
-	cd $(TARGETPREFIX) && \
+	cd $(TARGET_DIR) && \
 	mkdir -p .config/aacs .cache/aacs/vuk
-	cp $(IMAGEFILES)/libaacs/KEYDB.cfg $(TARGETPREFIX)/.config/aacs
+	cp $(IMAGEFILES)/libaacs/KEYDB.cfg $(TARGET_DIR)/.config/aacs
 	touch $@
-$(D)/libbdplus: $(ARCHIVE)/libbdplus-$(LIBBDPLUS_VER).tar.bz2 $(D)/libaacs | $(TARGETPREFIX)
+$(D)/libbdplus: $(ARCHIVE)/libbdplus-$(LIBBDPLUS_VER).tar.bz2 $(D)/libaacs | $(TARGET_DIR)
 	$(UNTAR)/libbdplus-$(LIBBDPLUS_VER).tar.bz2
 	pushd $(BUILD_TMP)/libbdplus-$(LIBBDPLUS_VER) && \
 		./bootstrap && \
@ -815,16 +815,16 @@ $(D)/libbdplus: $(ARCHIVE)/libbdplus-$(LIBBDPLUS_VER).tar.bz2 $(D)/libaacs | $(T
 			--enable-shared \
 			--disable-static && \
 		$(MAKE) && \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libbdplus.pc
 	$(REWRITE_LIBTOOL)/libbdplus.la
 	$(REMOVE)/libbdplus-$(LIBBDPLUS_VER)
-	cd $(TARGETPREFIX) && \
+	cd $(TARGET_DIR) && \
 	mkdir -p .config/bdplus/vm0
-	cp -f $(IMAGEFILES)/libbdplus/* $(TARGETPREFIX)/.config/bdplus/vm0
+	cp -f $(IMAGEFILES)/libbdplus/* $(TARGET_DIR)/.config/bdplus/vm0
 	touch $@
-$(D)/libxml2: $(ARCHIVE)/libxml2-$(LIBXML2_VER).tar.gz | $(TARGETPREFIX)
+$(D)/libxml2: $(ARCHIVE)/libxml2-$(LIBXML2_VER).tar.gz | $(TARGET_DIR)
 	$(UNTAR)/libxml2-$(LIBXML2_VER).tar.gz
 	pushd $(BUILD_TMP)/libxml2-$(LIBXML2_VER) && \
 		$(CONFIGURE) \
@ -842,8 +842,8 @@ $(D)/libxml2: $(ARCHIVE)/libxml2-$(LIBXML2_VER).tar.gz | $(TARGETPREFIX)
 			--without-lzma \
 			--without-schematron && \
 		$(MAKE) && \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	mv $(TARGETPREFIX)/bin/xml2-config $(HOST_DIR)/bin
+	mv $(TARGET_DIR)/bin/xml2-config $(HOST_DIR)/bin
 	$(REWRITE_LIBTOOL)/libxml2.la
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libxml-2.0.pc
 	$(REWRITE_PKGCONF) $(HOST_DIR)/bin/xml2-config
@ -852,7 +852,7 @@ $(D)/libxml2: $(ARCHIVE)/libxml2-$(LIBXML2_VER).tar.gz | $(TARGETPREFIX)
 	$(REMOVE)/libxml2-$(LIBXML2_VER)
 	touch $@
-$(D)/pugixml: $(ARCHIVE)/pugixml-$(PUGIXML_VER).tar.gz | $(TARGETPREFIX)
+$(D)/pugixml: $(ARCHIVE)/pugixml-$(PUGIXML_VER).tar.gz | $(TARGET_DIR)
 	$(REMOVE)/pugixml-$(PUGIXML_VER)
 	$(UNTAR)/pugixml-$(PUGIXML_VER).tar.gz
 	set -e; cd $(BUILD_TMP)/pugixml-$(PUGIXML_VER); \
@ -875,26 +875,26 @@ $(D)/pugixml: $(ARCHIVE)/pugixml-$(PUGIXML_VER).tar.gz | $(TARGETPREFIX)
 		-DCMAKE_STRIP="$(CROSS_BASE)/bin/$(TARGET)-strip" \
 		; \
 		$(MAKE); \
-		make install DESTDIR=$(TARGETPREFIX)
+		make install DESTDIR=$(TARGET_DIR)
-	rm -rf $(TARGETPREFIX)/lib/cmake
+	rm -rf $(TARGET_DIR)/lib/cmake
 	$(REMOVE)/pugixml-$(PUGIXML_VER)
 	touch $@
-$(D)/librtmp: $(D)/zlib $(D)/openssl | $(TARGETPREFIX)
+$(D)/librtmp: $(D)/zlib $(D)/openssl | $(TARGET_DIR)
 	$(REMOVE)/rtmpdump
 	git clone https://bitbucket.org/neutrino-images/ni-rtmpdump.git $(BUILD_TMP)/rtmpdump
 	set -e; cd $(BUILD_TMP)/rtmpdump; \
-		make CROSS_COMPILE=$(TARGET)- XCFLAGS="-I$(TARGETPREFIX)/include -L$(TARGETPREFIX)/lib" LDFLAGS="-L$(TARGETPREFIX)/lib" prefix=$(TARGETPREFIX);\
+		make CROSS_COMPILE=$(TARGET)- XCFLAGS="-I$(TARGET_DIR)/include -L$(TARGET_DIR)/lib" LDFLAGS="-L$(TARGET_DIR)/lib" prefix=$(TARGET_DIR);\
-		make install DESTDIR=$(TARGETPREFIX) prefix="" mandir=/.remove ;\
+		make install DESTDIR=$(TARGET_DIR) prefix="" mandir=/.remove ;\
-		rm -rf $(TARGETPREFIX)/.remove
+		rm -rf $(TARGET_DIR)/.remove
-		rm -rf $(TARGETPREFIX)/sbin/rtmpgw
+		rm -rf $(TARGET_DIR)/sbin/rtmpgw
-		rm -rf $(TARGETPREFIX)/sbin/rtmpsrv
+		rm -rf $(TARGET_DIR)/sbin/rtmpsrv
-		rm -rf $(TARGETPREFIX)/sbin/rtmpsuck
+		rm -rf $(TARGET_DIR)/sbin/rtmpsuck
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/librtmp.pc
 	$(REMOVE)/rtmpdump
 	touch $@
-$(D)/libtirpc: $(ARCHIVE)/libtirpc-$(LIBTIRPC_VER).tar.bz2 | $(TARGETPREFIX)
+$(D)/libtirpc: $(ARCHIVE)/libtirpc-$(LIBTIRPC_VER).tar.bz2 | $(TARGET_DIR)
 	$(UNTAR)/libtirpc-$(LIBTIRPC_VER).tar.bz2
 	cd $(BUILD_TMP)/libtirpc-$(LIBTIRPC_VER) && \
 	$(PATCH)/libtirpc-0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch && \
@ -912,13 +912,13 @@ $(D)/libtirpc: $(ARCHIVE)/libtirpc-$(LIBTIRPC_VER).tar.bz2 | $(TARGETPREFIX)
 			--enable-silent-rules \
 			--mandir=/.remove && \
 		$(MAKE) && \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_LIBTOOL)/libtirpc.la
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libtirpc.pc
 	$(REMOVE)/libtirpc-$(LIBTIRPC_VER)
 	touch $@
-$(D)/confuse: $(ARCHIVE)/confuse-$(CONFUSE_VER).tar.xz | $(TARGETPREFIX)
+$(D)/confuse: $(ARCHIVE)/confuse-$(CONFUSE_VER).tar.xz | $(TARGET_DIR)
 	$(UNTAR)/confuse-$(CONFUSE_VER).tar.xz
 	set -e; cd $(BUILD_TMP)/confuse-$(CONFUSE_VER); \
 		$(CONFIGURE) \
@ -929,12 +929,12 @@ $(D)/confuse: $(ARCHIVE)/confuse-$(CONFUSE_VER).tar.xz | $(TARGETPREFIX)
 			--enable-static \
 			--disable-shared \
 		$(MAKE); \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
 		$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libconfuse.pc
 	$(REMOVE)/confuse-$(CONFUSE_VER)
 	touch $@
-$(D)/libite: $(ARCHIVE)/libite-$(ITE_VER).tar.xz | $(TARGETPREFIX)
+$(D)/libite: $(ARCHIVE)/libite-$(ITE_VER).tar.xz | $(TARGET_DIR)
 	$(UNTAR)/libite-$(ITE_VER).tar.xz
 	set -e; cd $(BUILD_TMP)/libite-$(ITE_VER); \
 		$(CONFIGURE) \
@ -945,12 +945,12 @@ $(D)/libite: $(ARCHIVE)/libite-$(ITE_VER).tar.xz | $(TARGETPREFIX)
 			--enable-static \
 			--disable-shared \
 		$(MAKE); \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
 		$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libite.pc
 	$(REMOVE)/libite-$(ITE_VER)
 	touch $@
-$(D)/libmad: $(ARCHIVE)/libmad-$(LIBMAD_VER).tar.gz | $(TARGETPREFIX)
+$(D)/libmad: $(ARCHIVE)/libmad-$(LIBMAD_VER).tar.gz | $(TARGET_DIR)
 	$(UNTAR)/libmad-$(LIBMAD_VER).tar.gz
 	pushd $(BUILD_TMP)/libmad-$(LIBMAD_VER) && \
 		$(PATCH)/libmad-pc-fix.diff && \
@ -968,13 +968,13 @@ $(D)/libmad: $(ARCHIVE)/libmad-$(LIBMAD_VER).tar.gz | $(TARGETPREFIX)
 			--enable-fpm=arm \
 			--enable-sso && \
 		$(MAKE) all && \
-		make install DESTDIR=$(TARGETPREFIX) && \
+		make install DESTDIR=$(TARGET_DIR) && \
-		sed "s!^prefix=.*!prefix=$(TARGETPREFIX)!;" mad.pc > $(PKG_CONFIG_PATH)/libmad.pc
+		sed "s!^prefix=.*!prefix=$(TARGET_DIR)!;" mad.pc > $(PKG_CONFIG_PATH)/libmad.pc
 	$(REWRITE_LIBTOOL)/libmad.la
 	$(REMOVE)/libmad-$(LIBMAD_VER)
 	touch $@
-$(D)/libvorbisidec: $(ARCHIVE)/libvorbisidec_$(LIBVORBISIDEC_VER).orig.tar.gz $(D)/libogg | $(TARGETPREFIX)
+$(D)/libvorbisidec: $(ARCHIVE)/libvorbisidec_$(LIBVORBISIDEC_VER).orig.tar.gz $(D)/libogg | $(TARGET_DIR)
 	$(UNTAR)/libvorbisidec_$(LIBVORBISIDEC_VER).orig.tar.gz
 	pushd $(BUILD_TMP)/libvorbisidec-$(LIBVORBISIDEC_VER) && \
 		sed -i '122 s/^/#/' configure.in && \
@ -983,13 +983,13 @@ $(D)/libvorbisidec: $(ARCHIVE)/libvorbisidec_$(LIBVORBISIDEC_VER).orig.tar.gz $(
 		$(CONFIGURE) \
 			--prefix= && \
 		make all && \
-		make install DESTDIR=$(TARGETPREFIX) && \
+		make install DESTDIR=$(TARGET_DIR) && \
 	$(REMOVE)/libvorbisidec-$(LIBVORBISIDEC_VER)
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/vorbisidec.pc
 	$(REWRITE_LIBTOOL)/libvorbisidec.la
 	touch $@
-$(D)/libogg: $(ARCHIVE)/libogg-$(LIBOGG_VER).tar.xz | $(TARGETPREFIX)
+$(D)/libogg: $(ARCHIVE)/libogg-$(LIBOGG_VER).tar.xz | $(TARGET_DIR)
 	$(UNTAR)/libogg-$(LIBOGG_VER).tar.xz
 	pushd $(BUILD_TMP)/libogg-$(LIBOGG_VER) && \
 		$(CONFIGURE) \
@ -997,13 +997,13 @@ $(D)/libogg: $(ARCHIVE)/libogg-$(LIBOGG_VER).tar.xz | $(TARGETPREFIX)
 			--datarootdir=/.remove \
 			--enable-shared && \
 		$(MAKE) && \
-		make install DESTDIR=$(TARGETPREFIX)
+		make install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/ogg.pc
 	$(REWRITE_LIBTOOL)/libogg.la
 	$(REMOVE)/libogg-$(LIBOGG_VER)
 	touch $@
-$(D)/libfribidi: $(ARCHIVE)/fribidi-$(FRIBIDI_VER).tar.bz2 | $(TARGETPREFIX)
+$(D)/libfribidi: $(ARCHIVE)/fribidi-$(FRIBIDI_VER).tar.bz2 | $(TARGET_DIR)
 	$(REMOVE)/fribidi-$(FRIBIDI_VER)
 	$(UNTAR)/fribidi-$(FRIBIDI_VER).tar.bz2
 	set -e; cd $(BUILD_TMP)/fribidi-$(FRIBIDI_VER); \
@ -1016,7 +1016,7 @@ $(D)/libfribidi: $(ARCHIVE)/fribidi-$(FRIBIDI_VER).tar.bz2 | $(TARGETPREFIX)
 			--with-glib=no \
 			; \
 		$(MAKE); \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/fribidi.pc
 	$(REWRITE_LIBTOOL)/libfribidi.la
 	$(REMOVE)/fribidi-$(FRIBIDI_VER)
@ -1037,7 +1037,7 @@ $(D)/libffi: $(ARCHIVE)/libffi-$(LIBFFI_VER).tar.gz
 			$(LIBFFI_CONF) \
 		; \
 		$(MAKE) all; \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libffi.pc
 	$(REWRITE_LIBTOOL)/libffi.la
 	$(REMOVE)/libffi-$(LIBFFI_VER)
@ -1056,7 +1056,7 @@ ifeq ($(BOXSERIES), hd1)
 	LIBGLIB2_CONF = --enable-static --disable-shared
 endif
-$(D)/libglib2: $(ARCHIVE)/glib-$(GLIB_VER).tar.xz $(D)/zlib $(LIBGLIB2_DEPS) $(D)/libffi | $(TARGETPREFIX)
+$(D)/libglib2: $(ARCHIVE)/glib-$(GLIB_VER).tar.xz $(D)/zlib $(LIBGLIB2_DEPS) $(D)/libffi | $(TARGET_DIR)
 	$(UNTAR)/glib-$(GLIB_VER).tar.xz
 	pushd $(BUILD_TMP)/glib-$(GLIB_VER); \
 	$(PATCH)/libglib2-disable-tests.patch; \
@ -1078,15 +1078,15 @@ $(D)/libglib2: $(ARCHIVE)/glib-$(GLIB_VER).tar.xz $(D)/zlib $(LIBGLIB2_DEPS) $(D
 			$(LIBGLIB2_CONF) \
 			; \
 		$(MAKE) all; \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	rm -rf $(TARGETPREFIX)/bin/gapplication
+	rm -rf $(TARGET_DIR)/bin/gapplication
-	rm -rf $(TARGETPREFIX)/bin/gdbus*
+	rm -rf $(TARGET_DIR)/bin/gdbus*
-	rm -rf $(TARGETPREFIX)/bin/gio*
+	rm -rf $(TARGET_DIR)/bin/gio*
-	rm -rf $(TARGETPREFIX)/bin/glib*
+	rm -rf $(TARGET_DIR)/bin/glib*
-	rm -rf $(TARGETPREFIX)/bin/gobject-query
+	rm -rf $(TARGET_DIR)/bin/gobject-query
-	rm -rf $(TARGETPREFIX)/bin/gresource
+	rm -rf $(TARGET_DIR)/bin/gresource
-	rm -rf $(TARGETPREFIX)/bin/gsettings
+	rm -rf $(TARGET_DIR)/bin/gsettings
-	rm -rf $(TARGETPREFIX)/bin/gtester*
+	rm -rf $(TARGET_DIR)/bin/gtester*
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gio-2.0.pc
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gio-unix-2.0.pc
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/glib-2.0.pc
--- a/make/system-tools-extra.mk
+++ b/make/system-tools-extra.mk
@ -5,7 +5,7 @@ USB_UTILS_VER=007
 $(ARCHIVE)/usbutils-$(USB_UTILS_VER).tar.xz:
 	$(WGET) https://www.kernel.org/pub/linux/utils/usb/usbutils/usbutils-$(USB_UTILS_VER).tar.xz
-$(D)/usbutils: $(D)/libusb_compat $(ARCHIVE)/usbutils-$(USB_UTILS_VER).tar.xz | $(TARGETPREFIX)
+$(D)/usbutils: $(D)/libusb_compat $(ARCHIVE)/usbutils-$(USB_UTILS_VER).tar.xz | $(TARGET_DIR)
 	$(UNTAR)/usbutils-$(USB_UTILS_VER).tar.xz
 	cd $(BUILD_TMP)/usbutils-$(USB_UTILS_VER) && \
 	$(PATCH)/usbutils-avoid-dependency-on-bash.patch && \
@ -16,12 +16,12 @@ $(D)/usbutils: $(D)/libusb_compat $(ARCHIVE)/usbutils-$(USB_UTILS_VER).tar.xz |
 			--mandir=/.remove \
 			--infodir=/.remove && \
 		$(MAKE) && \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	rm -rf $(TARGETPREFIX)/bin/lsusb.py
+	rm -rf $(TARGET_DIR)/bin/lsusb.py
-	rm -rf $(TARGETPREFIX)/bin/usbhid-dump
+	rm -rf $(TARGET_DIR)/bin/usbhid-dump
-	rm -rf $(TARGETPREFIX)/sbin/update-usbids.sh
+	rm -rf $(TARGET_DIR)/sbin/update-usbids.sh
-	rm -rf $(TARGETPREFIX)/share/pkgconfig
+	rm -rf $(TARGET_DIR)/share/pkgconfig
-	rm -rf $(TARGETPREFIX)/share/usb.ids.gz
+	rm -rf $(TARGET_DIR)/share/usb.ids.gz
 	$(REMOVE)/usbutils-$(USB_UTILS_VER)
 	touch $@
@ -29,7 +29,7 @@ BINUTILS_VER=2.25
 $(ARCHIVE)/binutils-$(BINUTILS_VER).tar.bz2:
 	$(WGET) https://ftp.gnu.org/gnu/binutils/binutils-$(BINUTILS_VER).tar.bz2
-$(D)/binutils: $(ARCHIVE)/binutils-$(BINUTILS_VER).tar.bz2 | $(TARGETPREFIX)
+$(D)/binutils: $(ARCHIVE)/binutils-$(BINUTILS_VER).tar.bz2 | $(TARGET_DIR)
 	$(UNTAR)/binutils-$(BINUTILS_VER).tar.bz2
 	cd $(BUILD_TMP)/binutils-$(BINUTILS_VER) && \
 		$(CONFIGURE) \
@ -51,7 +51,7 @@ UTIL-LINUX_VER=2.29
 $(ARCHIVE)/util-linux-$(UTIL-LINUX_VER).tar.xz:
 	$(WGET) https://www.kernel.org/pub/linux/utils/util-linux/v$(UTIL-LINUX_VER)/util-linux-$(UTIL-LINUX_VER).tar.xz
-$(D)/util-linux: $(D)/libncurses $(ARCHIVE)/util-linux-$(UTIL-LINUX_VER).tar.xz | $(TARGETPREFIX)
+$(D)/util-linux: $(D)/libncurses $(ARCHIVE)/util-linux-$(UTIL-LINUX_VER).tar.xz | $(TARGET_DIR)
 	$(UNTAR)/util-linux-$(UTIL-LINUX_VER).tar.xz
 	cd $(BUILD_TMP)/util-linux-$(UTIL-LINUX_VER) && \
 		autoreconf -fi && \
@ -63,7 +63,7 @@ $(D)/util-linux: $(D)/libncurses $(ARCHIVE)/util-linux-$(UTIL-LINUX_VER).tar.xz
 			--disable-shared \
 			--mandir=/.remove && \
 		$(MAKE) sfdisk && \
-		install -m755 sfdisk $(TARGETPREFIX)/sbin/sfdisk
+		install -m755 sfdisk $(TARGET_DIR)/sbin/sfdisk
 	$(REMOVE)/util-linux-$(UTIL-LINUX_VER)
 	touch $@
@ -71,14 +71,14 @@ IPTABLES_VER = 1.4.21
 $(ARCHIVE)/iptables-$(IPTABLES_VER).tar.bz2:
 	$(WGET) http://www.netfilter.org/projects/iptables/files/iptables-$(IPTABLES_VER).tar.bz2
-$(D)/iptables: $(ARCHIVE)/iptables-$(IPTABLES_VER).tar.bz2 | $(TARGETPREFIX)
+$(D)/iptables: $(ARCHIVE)/iptables-$(IPTABLES_VER).tar.bz2 | $(TARGET_DIR)
 	$(UNTAR)/iptables-$(IPTABLES_VER).tar.bz2
 	set -e; cd $(BUILD_TMP)/iptables-$(IPTABLES_VER); \
 		$(CONFIGURE) \
 			--prefix= \
 			--mandir=/.remove; \
 		$(MAKE); \
-		make install DESTDIR=$(TARGETPREFIX)
+		make install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_LIBTOOL)/libip4tc.la
 	$(REWRITE_LIBTOOL)/libip6tc.la
 	$(REWRITE_LIBTOOL)/libiptc.la
@ -94,7 +94,7 @@ LIGHTTPD_VER=1.4.31
 $(ARCHIVE)/lighttpd-$(LIGHTTPD_VER).tar.gz:
 	$(WGET) http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-$(LIGHTTPD_VER).tar.gz
-$(D)/lighttpd: $(D)/zlib $(ARCHIVE)/lighttpd-$(LIGHTTPD_VER).tar.gz | $(TARGETPREFIX)
+$(D)/lighttpd: $(D)/zlib $(ARCHIVE)/lighttpd-$(LIGHTTPD_VER).tar.gz | $(TARGET_DIR)
 	$(UNTAR)/lighttpd-$(LIGHTTPD_VER).tar.gz
 	cd $(BUILD_TMP)/lighttpd-$(LIGHTTPD_VER) && \
 	$(BUILDENV) ./configure \
@ -109,7 +109,7 @@ $(D)/lighttpd: $(D)/zlib $(ARCHIVE)/lighttpd-$(LIGHTTPD_VER).tar.gz | $(TARGETPR
 		--without-pcre \
 		--without-bzip2 && \
 	$(MAKE) && \
-	$(MAKE) install DESTDIR=$(TARGETPREFIX)
+	$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REMOVE)/lighttpd-$(LIGHTTPD_VER)
 	touch $@
@ -117,7 +117,7 @@ PYTHON_VER=2.7.11
 $(ARCHIVE)/Python-$(PYTHON_VER).tgz:
 	$(WGET) http://www.python.org/ftp/python/$(PYTHON_VER)/Python-$(PYTHON_VER).tgz
-$(D)/python: $(ARCHIVE)/Python-$(PYTHON_VER).tgz | $(TARGETPREFIX)
+$(D)/python: $(ARCHIVE)/Python-$(PYTHON_VER).tgz | $(TARGET_DIR)
 	$(REMOVE)/Python-$(PYTHON_VER)
 	$(UNTAR)/Python-$(PYTHON_VER).tgz
 	pushd $(BUILD_TMP)/Python-$(PYTHON_VER) && \
@ -161,5 +161,5 @@ $(D)/python: $(ARCHIVE)/Python-$(PYTHON_VER).tgz | $(TARGETPREFIX)
 		cp -a $(BUILD_TMP)/Python-$(PYTHON_VER)/_install/lib/python* $(TARGETLIB)/
 		cp -a $(BUILD_TMP)/Python-$(PYTHON_VER)/_install/lib/libpython* $(TARGETLIB)/
 		chmod +w $(TARGETLIB)/libpython*
-		install -m755 $(BUILD_TMP)/Python-$(PYTHON_VER)/_install/bin/python $(TARGETPREFIX)/bin/
+		install -m755 $(BUILD_TMP)/Python-$(PYTHON_VER)/_install/bin/python $(TARGET_DIR)/bin/
 	$(REMOVE)/Python-$(PYTHON_VER)
--- a/make/system-tools.mk
+++ b/make/system-tools.mk
@ -1,6 +1,6 @@
 # makefile to build system tools
-$(D)/openvpn: $(D)/lzo $(D)/openssl $(ARCHIVE)/openvpn-$(OPENVPN_VER).tar.xz | $(TARGETPREFIX)
+$(D)/openvpn: $(D)/lzo $(D)/openssl $(ARCHIVE)/openvpn-$(OPENVPN_VER).tar.xz | $(TARGET_DIR)
 	$(UNTAR)/openvpn-$(OPENVPN_VER).tar.xz
 	cd $(BUILD_TMP)/openvpn-$(OPENVPN_VER) && \
 	$(CONFIGURE) \
@ -21,11 +21,11 @@ $(D)/openvpn: $(D)/lzo $(D)/openssl $(ARCHIVE)/openvpn-$(OPENVPN_VER).tar.xz | $
 		--disable-plugins \
 		--disable-pkcs11 && \
 	$(MAKE) && \
-	$(MAKE) install DESTDIR=$(TARGETPREFIX)
+	$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REMOVE)/openvpn-$(OPENVPN_VER)
 	touch $@
-$(D)/openssh: $(D)/openssl $(D)/zlib $(ARCHIVE)/openssh-$(OPENSSH_VER).tar.gz | $(TARGETPREFIX)
+$(D)/openssh: $(D)/openssl $(D)/zlib $(ARCHIVE)/openssh-$(OPENSSH_VER).tar.gz | $(TARGET_DIR)
 	$(UNTAR)/openssh-$(OPENSSH_VER).tar.gz
 	cd $(BUILD_TMP)/openssh-$(OPENSSH_VER) && \
 	export ac_cv_search_dlopen=no && \
@ -49,7 +49,7 @@ $(D)/openssh: $(D)/openssl $(D)/zlib $(ARCHIVE)/openssh-$(OPENSSH_VER).tar.gz |
 		--disable-pututline \
 		--disable-pututxline && \
 	$(MAKE) && \
-	$(MAKE) install DESTDIR=$(TARGETPREFIX)
+	$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REMOVE)/openssh-$(OPENSSH_VER)
 	touch $@
@ -59,7 +59,7 @@ else
  LOC_TIME = etc/localtime
 endif
-$(D)/timezone: $(ARCHIVE)/tzdata$(TZDATA_VER).tar.gz | $(TARGETPREFIX)
+$(D)/timezone: $(ARCHIVE)/tzdata$(TZDATA_VER).tar.gz | $(TARGET_DIR)
 	$(REMOVE)/timezone
 	mkdir $(BUILD_TMP)/timezone $(BUILD_TMP)/timezone/zoneinfo
 	tar -C $(BUILD_TMP)/timezone -xf $(ARCHIVE)/tzdata$(TZDATA_VER).tar.gz
@ -77,14 +77,14 @@ $(D)/timezone: $(ARCHIVE)/tzdata$(TZDATA_VER).tar.gz | $(TARGETPREFIX)
 			done; \
 			test -e zoneinfo/$$x || echo "WARNING: timezone $$x not found."; \
 		done; \
-		install -d -m 0755 $(TARGETPREFIX)/share/ $(TARGETPREFIX)/etc; \
+		install -d -m 0755 $(TARGET_DIR)/share/ $(TARGET_DIR)/etc; \
-		mv zoneinfo/ $(TARGETPREFIX)/share/
+		mv zoneinfo/ $(TARGET_DIR)/share/
-	install -m 0644 $(IMAGEFILES)/timezone/timezone.xml $(TARGETPREFIX)/etc/
+	install -m 0644 $(IMAGEFILES)/timezone/timezone.xml $(TARGET_DIR)/etc/
-	cp $(TARGETPREFIX)/share/zoneinfo/CET $(TARGETPREFIX)/$(LOC_TIME)
+	cp $(TARGET_DIR)/share/zoneinfo/CET $(TARGET_DIR)/$(LOC_TIME)
 	$(REMOVE)/timezone
 	touch $@
-$(D)/mtd-utils: $(D)/zlib $(D)/lzo $(D)/e2fsprogs $(ARCHIVE)/mtd-utils-$(MTD-UTILS_VER).tar.bz2 | $(TARGETPREFIX)
+$(D)/mtd-utils: $(D)/zlib $(D)/lzo $(D)/e2fsprogs $(ARCHIVE)/mtd-utils-$(MTD-UTILS_VER).tar.bz2 | $(TARGET_DIR)
 	$(UNTAR)/mtd-utils-$(MTD-UTILS_VER).tar.bz2
 	pushd $(BUILD_TMP)/mtd-utils-$(MTD-UTILS_VER) && \
 		$(CONFIGURE) \
@ -97,17 +97,17 @@ $(D)/mtd-utils: $(D)/zlib $(D)/lzo $(D)/e2fsprogs $(ARCHIVE)/mtd-utils-$(MTD-UTI
 			&& \
 		$(MAKE)
 ifeq ($(BOXSERIES), hd2)
-		install -D -m 0755 $(BUILD_TMP)/mtd-utils-$(MTD-UTILS_VER)/nanddump $(TARGETPREFIX)/sbin
+		install -D -m 0755 $(BUILD_TMP)/mtd-utils-$(MTD-UTILS_VER)/nanddump $(TARGET_DIR)/sbin
-		install -D -m 0755 $(BUILD_TMP)/mtd-utils-$(MTD-UTILS_VER)/nandtest $(TARGETPREFIX)/sbin
+		install -D -m 0755 $(BUILD_TMP)/mtd-utils-$(MTD-UTILS_VER)/nandtest $(TARGET_DIR)/sbin
-		install -D -m 0755 $(BUILD_TMP)/mtd-utils-$(MTD-UTILS_VER)/nandwrite $(TARGETPREFIX)/sbin
+		install -D -m 0755 $(BUILD_TMP)/mtd-utils-$(MTD-UTILS_VER)/nandwrite $(TARGET_DIR)/sbin
-		install -D -m 0755 $(BUILD_TMP)/mtd-utils-$(MTD-UTILS_VER)/mtd_debug $(TARGETPREFIX)/sbin
+		install -D -m 0755 $(BUILD_TMP)/mtd-utils-$(MTD-UTILS_VER)/mtd_debug $(TARGET_DIR)/sbin
-		install -D -m 0755 $(BUILD_TMP)/mtd-utils-$(MTD-UTILS_VER)/mkfs.jffs2 $(TARGETPREFIX)/sbin
+		install -D -m 0755 $(BUILD_TMP)/mtd-utils-$(MTD-UTILS_VER)/mkfs.jffs2 $(TARGET_DIR)/sbin
 endif
-		install -D -m 0755 $(BUILD_TMP)/mtd-utils-$(MTD-UTILS_VER)/flash_erase $(TARGETPREFIX)/sbin
+		install -D -m 0755 $(BUILD_TMP)/mtd-utils-$(MTD-UTILS_VER)/flash_erase $(TARGET_DIR)/sbin
 		$(REMOVE)/mtd-utils-$(MTD-UTILS_VER)
 		touch $@
-$(D)/iperf: $(ARCHIVE)/iperf-$(IPERF_VER)-source.tar.gz | $(TARGETPREFIX)
+$(D)/iperf: $(ARCHIVE)/iperf-$(IPERF_VER)-source.tar.gz | $(TARGET_DIR)
 	$(UNTAR)/iperf-$(IPERF_VER)-source.tar.gz
 	pushd $(BUILD_TMP)/iperf-$(IPERF_VER); \
 		$(PATCH)/iperf-disable-profiling.patch && \
@ -116,11 +116,11 @@ $(D)/iperf: $(ARCHIVE)/iperf-$(IPERF_VER)-source.tar.gz | $(TARGETPREFIX)
 			--prefix= \
 			--mandir=/.remove; \
 		$(MAKE); \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REMOVE)/iperf-$(IPERF_VER)
 	touch $@
-$(D)/parted: $(D)/e2fsprogs $(ARCHIVE)/parted-$(PARTED_VER).tar.xz | $(TARGETPREFIX)
+$(D)/parted: $(D)/e2fsprogs $(ARCHIVE)/parted-$(PARTED_VER).tar.xz | $(TARGET_DIR)
 	$(UNTAR)/parted-$(PARTED_VER).tar.xz
 	cd $(BUILD_TMP)/parted-$(PARTED_VER) && \
 		$(PATCH)/parted-3.2-devmapper-1.patch && \
@ -139,23 +139,23 @@ $(D)/parted: $(D)/e2fsprogs $(ARCHIVE)/parted-$(PARTED_VER).tar.xz | $(TARGETPRE
 			--disable-device-mapper \
 			--without-readline && \
 		$(MAKE) && \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_LIBTOOL)/libparted.la
 	$(REWRITE_LIBTOOL)/libparted-fs-resize.la
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libparted.pc
 	$(REMOVE)/parted-$(PARTED_VER)
 	touch $@
-$(D)/hdparm: $(ARCHIVE)/hdparm-$(HDPARM_VER).tar.gz | $(TARGETPREFIX)
+$(D)/hdparm: $(ARCHIVE)/hdparm-$(HDPARM_VER).tar.gz | $(TARGET_DIR)
 	$(UNTAR)/hdparm-$(HDPARM_VER).tar.gz
 	pushd $(BUILD_TMP)/hdparm-$(HDPARM_VER) && \
 		$(BUILDENV) \
 		$(MAKE) CC=$(TARGET)-gcc STRIP=$(TARGET)-strip && \
-		install -m755 hdparm $(TARGETPREFIX)/sbin/hdparm
+		install -m755 hdparm $(TARGET_DIR)/sbin/hdparm
 	$(REMOVE)/hdparm-$(HDPARM_VER)
 	touch $@
-$(D)/hd-idle: $(ARCHIVE)/hd-idle-$(HDIDLE_VER).tgz | $(TARGETPREFIX)
+$(D)/hd-idle: $(ARCHIVE)/hd-idle-$(HDIDLE_VER).tgz | $(TARGET_DIR)
 	$(UNTAR)/hd-idle-$(HDIDLE_VER).tgz
 	pushd $(BUILD_TMP)/hd-idle && \
 		$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -o hd-idle hd-idle.c && \
@ -164,7 +164,7 @@ $(D)/hd-idle: $(ARCHIVE)/hd-idle-$(HDIDLE_VER).tgz | $(TARGETPREFIX)
 	touch $@
 # only used for "touch"
-$(D)/coreutils: $(ARCHIVE)/coreutils-$(COREUTILS_VER).tar.xz | $(TARGETPREFIX)
+$(D)/coreutils: $(ARCHIVE)/coreutils-$(COREUTILS_VER).tar.xz | $(TARGET_DIR)
 	$(UNTAR)/coreutils-$(COREUTILS_VER).tar.xz
 	cd $(BUILD_TMP)/coreutils-$(COREUTILS_VER) && \
 		$(PATCH)/coreutils-fix-coolstream-build.patch && \
@ -183,7 +183,7 @@ $(D)/coreutils: $(ARCHIVE)/coreutils-$(COREUTILS_VER).tar.xz | $(TARGETPREFIX)
 	$(REMOVE)/coreutils-$(COREUTILS_VER)
 	touch $@
-$(D)/less: $(D)/libncurses $(ARCHIVE)/less-$(LESS_VER).tar.gz | $(TARGETPREFIX)
+$(D)/less: $(D)/libncurses $(ARCHIVE)/less-$(LESS_VER).tar.gz | $(TARGET_DIR)
 	$(REMOVE)/less-$(LESS_VER)
 	$(UNTAR)/less-$(LESS_VER).tar.gz
 	cd $(BUILD_TMP)/less-$(LESS_VER) && \
@ -193,11 +193,11 @@ $(D)/less: $(D)/libncurses $(ARCHIVE)/less-$(LESS_VER).tar.gz | $(TARGETPREFIX)
 			--mandir=/.remove \
 			&& \
 		$(MAKE) && \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REMOVE)/less-$(LESS_VER)
 	touch $@
-$(D)/ntp: $(ARCHIVE)/ntp-$(NTP_VER).tar.gz $(D)/openssl | $(TARGETPREFIX)
+$(D)/ntp: $(ARCHIVE)/ntp-$(NTP_VER).tar.gz $(D)/openssl | $(TARGET_DIR)
 	$(UNTAR)/ntp-$(NTP_VER).tar.gz
 	pushd $(BUILD_TMP)/ntp-$(NTP_VER) && \
 		$(CONFIGURE) \
@ -208,11 +208,11 @@ $(D)/ntp: $(ARCHIVE)/ntp-$(NTP_VER).tar.gz $(D)/openssl | $(TARGETPREFIX)
 			--with-yielding-select=yes \
 			--without-ntpsnmpd && \
 		$(MAKE)
-	mv -v $(BUILD_TMP)/ntp-$(NTP_VER)/ntpdate/ntpdate $(TARGETPREFIX)/sbin/
+	mv -v $(BUILD_TMP)/ntp-$(NTP_VER)/ntpdate/ntpdate $(TARGET_DIR)/sbin/
 	$(REMOVE)/ntp-$(NTP_VER)
 	touch $@
-$(D)/djmount: $(ARCHIVE)/djmount-$(DJMOUNT_VER).tar.gz $(D)/libfuse | $(TARGETPREFIX)
+$(D)/djmount: $(ARCHIVE)/djmount-$(DJMOUNT_VER).tar.gz $(D)/libfuse | $(TARGET_DIR)
 	$(UNTAR)/djmount-$(DJMOUNT_VER).tar.gz
 	pushd $(BUILD_TMP)/djmount-$(DJMOUNT_VER) && \
 		$(PATCH)/djmount-fix-hang-with-asset-upnp.patch && \
@ -228,21 +228,21 @@ $(D)/djmount: $(ARCHIVE)/djmount-$(DJMOUNT_VER).tar.gz $(D)/libfuse | $(TARGETPR
 			--prefix= \
 			--disable-debug && \
 		make && \
-		make install DESTDIR=$(TARGETPREFIX)
+		make install DESTDIR=$(TARGET_DIR)
-	install -D -m 755 $(IMAGEFILES)/scripts/djmount.init $(TARGETPREFIX)/etc/init.d/djmount
+	install -D -m 755 $(IMAGEFILES)/scripts/djmount.init $(TARGET_DIR)/etc/init.d/djmount
-	ln -sf djmount $(TARGETPREFIX)/etc/init.d/S99djmount
+	ln -sf djmount $(TARGET_DIR)/etc/init.d/S99djmount
-	ln -sf djmount $(TARGETPREFIX)/etc/init.d/K01djmount
+	ln -sf djmount $(TARGET_DIR)/etc/init.d/K01djmount
 	$(REMOVE)/djmount-$(DJMOUNT_VER)
 	touch $@
-$(D)/ushare: $(ARCHIVE)/ushare-$(USHARE_VER).tar.bz2 $(D)/libupnp | $(TARGETPREFIX)
+$(D)/ushare: $(ARCHIVE)/ushare-$(USHARE_VER).tar.bz2 $(D)/libupnp | $(TARGET_DIR)
 	$(UNTAR)/ushare-$(USHARE_VER).tar.bz2
 	pushd $(BUILD_TMP)/ushare-$(USHARE_VER) && \
 		$(PATCH)/ushare.diff && \
 		$(PATCH)/ushare-fix-building-with-gcc-5.x.patch && \
 		$(BUILDENV) \
 		./configure \
-			--prefix=$(TARGETPREFIX) \
+			--prefix=$(TARGET_DIR) \
 			--disable-dlna \
 			--disable-nls \
 			--cross-compile \
@ -252,14 +252,14 @@ $(D)/ushare: $(ARCHIVE)/ushare-$(USHARE_VER).tar.bz2 $(D)/libupnp | $(TARGETPREF
 		ln -sf ../config.h src/ && \
 		$(MAKE) && \
 		$(MAKE) install && \
-		install -D -m 0644 $(IMAGEFILES)/scripts/ushare.conf $(TARGETPREFIX)/etc/ushare.conf
+		install -D -m 0644 $(IMAGEFILES)/scripts/ushare.conf $(TARGET_DIR)/etc/ushare.conf
-		install -D -m 0755 $(IMAGEFILES)/scripts/ushare.init $(TARGETPREFIX)/etc/init.d/ushare
+		install -D -m 0755 $(IMAGEFILES)/scripts/ushare.init $(TARGET_DIR)/etc/init.d/ushare
-		ln -sf ushare $(TARGETPREFIX)/etc/init.d/S99ushare
+		ln -sf ushare $(TARGET_DIR)/etc/init.d/S99ushare
-		ln -sf ushare $(TARGETPREFIX)/etc/init.d/K01ushare
+		ln -sf ushare $(TARGET_DIR)/etc/init.d/K01ushare
 	$(REMOVE)/ushare-$(USHARE_VER)
 	touch $@
-$(D)/smartmontools: $(ARCHIVE)/smartmontools-$(SMARTMON_VER).tar.gz | $(TARGETPREFIX)
+$(D)/smartmontools: $(ARCHIVE)/smartmontools-$(SMARTMON_VER).tar.gz | $(TARGET_DIR)
 	$(UNTAR)/smartmontools-$(SMARTMON_VER).tar.gz
 	cd $(BUILD_TMP)/smartmontools-$(SMARTMON_VER) && \
 		$(BUILDENV) \
@ -267,11 +267,11 @@ $(D)/smartmontools: $(ARCHIVE)/smartmontools-$(SMARTMON_VER).tar.gz | $(TARGETPR
 			--target=$(TARGET) \
 			--prefix= && \
 		$(MAKE) && \
-		install -m755 smartctl $(TARGETPREFIX)/sbin/smartctl
+		install -m755 smartctl $(TARGET_DIR)/sbin/smartctl
 	$(REMOVE)/smartmontools-$(SMARTMON_VER)
 	touch $@
-$(D)/inadyn: $(D)/openssl $(D)/confuse $(D)/libite $(ARCHIVE)/inadyn-$(INADYN_VER).tar.xz | $(TARGETPREFIX)
+$(D)/inadyn: $(D)/openssl $(D)/confuse $(D)/libite $(ARCHIVE)/inadyn-$(INADYN_VER).tar.xz | $(TARGET_DIR)
 	$(REMOVE)/inadyn-$(INADYN_VER)
 	$(UNTAR)/inadyn-$(INADYN_VER).tar.xz
 	cd $(BUILD_TMP)/inadyn-$(INADYN_VER) && \
@ -284,16 +284,16 @@ $(D)/inadyn: $(D)/openssl $(D)/confuse $(D)/libite $(ARCHIVE)/inadyn-$(INADYN_VE
 			--docdir=/.remove \
 			--enable-openssl && \
 		$(MAKE); \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	install -D -m 644 $(IMAGEFILES)/scripts/inadyn.conf $(TARGETPREFIX)/var/etc/inadyn.conf
+	install -D -m 644 $(IMAGEFILES)/scripts/inadyn.conf $(TARGET_DIR)/var/etc/inadyn.conf
-	ln -sf /var/etc/inadyn.conf $(TARGETPREFIX)/etc/inadyn.conf
+	ln -sf /var/etc/inadyn.conf $(TARGET_DIR)/etc/inadyn.conf
-	install -D -m 755 $(IMAGEFILES)/scripts/inadyn.init $(TARGETPREFIX)/etc/init.d/inadyn
+	install -D -m 755 $(IMAGEFILES)/scripts/inadyn.init $(TARGET_DIR)/etc/init.d/inadyn
-	ln -sf inadyn $(TARGETPREFIX)/etc/init.d/S80inadyn
+	ln -sf inadyn $(TARGET_DIR)/etc/init.d/S80inadyn
-	ln -sf inadyn $(TARGETPREFIX)/etc/init.d/K60inadyn
+	ln -sf inadyn $(TARGET_DIR)/etc/init.d/K60inadyn
 	$(REMOVE)/inadyn-$(INADYN_VER)
 	touch $@
-$(D)/vsftpd: $(D)/openssl $(ARCHIVE)/vsftpd-$(VSFTPD_VER).tar.gz | $(TARGETPREFIX)
+$(D)/vsftpd: $(D)/openssl $(ARCHIVE)/vsftpd-$(VSFTPD_VER).tar.gz | $(TARGET_DIR)
 	$(UNTAR)/vsftpd-$(VSFTPD_VER).tar.gz
 	cd $(BUILD_TMP)/vsftpd-$(VSFTPD_VER) && \
 		$(PATCH)/vsftpd-fix-CVE-2015-1419.patch && \
@ -301,18 +301,18 @@ $(D)/vsftpd: $(D)/openssl $(ARCHIVE)/vsftpd-$(VSFTPD_VER).tar.gz | $(TARGETPREFI
 		sed -i -e 's/.*VSF_BUILD_PAM/#undef VSF_BUILD_PAM/' builddefs.h && \
 		sed -i -e 's/.*VSF_BUILD_SSL/#define VSF_BUILD_SSL/' builddefs.h && \
 		make clean && \
-		TARGETPREFIX=$(TARGETPREFIX) make CC=$(TARGET)-gcc LIBS="-lcrypt -lcrypto -lssl" CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)"
+		TARGET_DIR=$(TARGET_DIR) make CC=$(TARGET)-gcc LIBS="-lcrypt -lcrypto -lssl" CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)"
-	install -d $(TARGETPREFIX)/share/empty
+	install -d $(TARGET_DIR)/share/empty
-	install -D -m 755 $(BUILD_TMP)/vsftpd-$(VSFTPD_VER)/vsftpd $(TARGETPREFIX)/sbin/vsftpd
+	install -D -m 755 $(BUILD_TMP)/vsftpd-$(VSFTPD_VER)/vsftpd $(TARGET_DIR)/sbin/vsftpd
-	install -D -m 644 $(IMAGEFILES)/scripts/vsftpd.conf $(TARGETPREFIX)/etc/vsftpd.conf
+	install -D -m 644 $(IMAGEFILES)/scripts/vsftpd.conf $(TARGET_DIR)/etc/vsftpd.conf
-	install -D -m 644 $(IMAGEFILES)/scripts/vsftpd.chroot_list $(TARGETPREFIX)/etc/vsftpd.chroot_list
+	install -D -m 644 $(IMAGEFILES)/scripts/vsftpd.chroot_list $(TARGET_DIR)/etc/vsftpd.chroot_list
-	install -D -m 755 $(IMAGEFILES)/scripts/vsftpd.init $(TARGETPREFIX)/etc/init.d/vsftpd
+	install -D -m 755 $(IMAGEFILES)/scripts/vsftpd.init $(TARGET_DIR)/etc/init.d/vsftpd
-	ln -sf vsftpd $(TARGETPREFIX)/etc/init.d/S53vsftpd
+	ln -sf vsftpd $(TARGET_DIR)/etc/init.d/S53vsftpd
-	ln -sf vsftpd $(TARGETPREFIX)/etc/init.d/K80vsftpd
+	ln -sf vsftpd $(TARGET_DIR)/etc/init.d/K80vsftpd
 	$(REMOVE)/vsftpd-$(VSFTPD_VER)
 	touch $@
-$(D)/procps-ng: $(D)/libncurses $(ARCHIVE)/procps-ng-$(PROCPS-NG_VER).tar.xz | $(TARGETPREFIX)
+$(D)/procps-ng: $(D)/libncurses $(ARCHIVE)/procps-ng-$(PROCPS-NG_VER).tar.xz | $(TARGET_DIR)
 	$(UNTAR)/procps-ng-$(PROCPS-NG_VER).tar.xz
 	cd $(BUILD_TMP)/procps-ng-$(PROCPS-NG_VER) && \
 	export ac_cv_func_malloc_0_nonnull=yes && \
@ -321,14 +321,14 @@ $(D)/procps-ng: $(D)/libncurses $(ARCHIVE)/procps-ng-$(PROCPS-NG_VER).tar.xz | $
 			--target=$(TARGET) \
 			--prefix= && \
 		$(MAKE) && \
-		rm -f $(TARGETPREFIX)/bin/ps $(TARGETPREFIX)/bin/top && \
+		rm -f $(TARGET_DIR)/bin/ps $(TARGET_DIR)/bin/top && \
-		install -D -m 755 top/.libs/top $(TARGETPREFIX)/bin/top && \
+		install -D -m 755 top/.libs/top $(TARGET_DIR)/bin/top && \
-		install -D -m 755 ps/.libs/pscommand $(TARGETPREFIX)/bin/ps && \
+		install -D -m 755 ps/.libs/pscommand $(TARGET_DIR)/bin/ps && \
 		cp -a proc/.libs/libprocps.so* $(TARGETLIB)
 	$(REMOVE)/procps-ng-$(PROCPS-NG_VER)
 	touch $@
-$(D)/nano: $(D)/libncurses $(ARCHIVE)/nano-$(NANO_VER).tar.gz | $(TARGETPREFIX)
+$(D)/nano: $(D)/libncurses $(ARCHIVE)/nano-$(NANO_VER).tar.gz | $(TARGET_DIR)
 	$(UNTAR)/nano-$(NANO_VER).tar.gz
 	cd $(BUILD_TMP)/nano-$(NANO_VER) && \
 		export ac_cv_prog_NCURSESW_CONFIG=false && \
@ -336,11 +336,11 @@ $(D)/nano: $(D)/libncurses $(ARCHIVE)/nano-$(NANO_VER).tar.gz | $(TARGETPREFIX)
 			--target=$(TARGET) \
 			--prefix= && \
 		$(MAKE) CURSES_LIB="-lncurses" && \
-		install -m755 src/nano $(TARGETPREFIX)/bin
+		install -m755 src/nano $(TARGET_DIR)/bin
 	$(REMOVE)/nano-$(NANO_VER)
 	touch $@
-$(D)/minicom: $(D)/libncurses $(ARCHIVE)/minicom-$(MINICOM_VER).tar.gz | $(TARGETPREFIX)
+$(D)/minicom: $(D)/libncurses $(ARCHIVE)/minicom-$(MINICOM_VER).tar.gz | $(TARGET_DIR)
 	$(UNTAR)/minicom-$(MINICOM_VER).tar.gz
 	cd $(BUILD_TMP)/minicom-$(MINICOM_VER) && \
 		$(PATCH)/minicom-fix-h-v-return-value-is-not-0.patch && \
@ -349,7 +349,7 @@ $(D)/minicom: $(D)/libncurses $(ARCHIVE)/minicom-$(MINICOM_VER).tar.gz | $(TARGE
 			--target=$(TARGET) \
 			--disable-nls && \
 		$(MAKE) && \
-		install -m755 src/minicom $(TARGETPREFIX)/bin
+		install -m755 src/minicom $(TARGET_DIR)/bin
 	$(REMOVE)/minicom-$(MINICOM_VER)
 	touch $@
@ -374,9 +374,9 @@ BUSYBOX_MAKE_OPTS = \
 	CROSS_COMPILE="$(TARGET)-" \
 	CFLAGS_EXTRA="$(TARGET_CFLAGS)" \
 	EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
-	CONFIG_PREFIX="$(TARGETPREFIX)"
+	CONFIG_PREFIX="$(TARGET_DIR)"
-$(D)/busybox: $(D)/libtirpc $(ARCHIVE)/busybox-$(BUSYBOX_VER).tar.bz2 | $(TARGETPREFIX)
+$(D)/busybox: $(D)/libtirpc $(ARCHIVE)/busybox-$(BUSYBOX_VER).tar.bz2 | $(TARGET_DIR)
 	$(REMOVE)/busybox-$(BUSYBOX_VER)
 	$(UNTAR)/busybox-$(BUSYBOX_VER).tar.bz2
 	pushd $(BUILD_TMP)/busybox-$(BUSYBOX_VER) && \
@ -390,7 +390,7 @@ $(D)/busybox: $(D)/libtirpc $(ARCHIVE)/busybox-$(BUSYBOX_VER).tar.bz2 | $(TARGET
 	$(REMOVE)/busybox-$(BUSYBOX_VER)
 	touch $@
-$(D)/bash: $(ARCHIVE)/bash-$(BASH_VER).tar.gz | $(TARGETPREFIX)
+$(D)/bash: $(ARCHIVE)/bash-$(BASH_VER).tar.gz | $(TARGET_DIR)
 	$(REMOVE)/bash-$(BASH_VER)
 	$(UNTAR)/bash-$(BASH_VER).tar.gz
 	cd $(BUILD_TMP)/bash-$(BASH_VER); \
@ -399,11 +399,11 @@ $(D)/bash: $(ARCHIVE)/bash-$(BASH_VER).tar.gz | $(TARGETPREFIX)
 		done; \
 		$(CONFIGURE) && \
 		$(MAKE) && \
-		install -m 755 bash $(TARGETPREFIX)/bin
+		install -m 755 bash $(TARGET_DIR)/bin
 	$(REMOVE)/bash-$(BASH_VER)
 	touch $@
-$(D)/e2fsprogs: $(ARCHIVE)/e2fsprogs-$(E2FSPROGS_VER).tar.gz | $(TARGETPREFIX)
+$(D)/e2fsprogs: $(ARCHIVE)/e2fsprogs-$(E2FSPROGS_VER).tar.gz | $(TARGET_DIR)
 	$(UNTAR)/e2fsprogs-$(E2FSPROGS_VER).tar.gz
 	cd $(BUILD_TMP)/e2fsprogs-$(E2FSPROGS_VER) && \
 		autoreconf -fi && \
@ -427,16 +427,16 @@ $(D)/e2fsprogs: $(ARCHIVE)/e2fsprogs-$(E2FSPROGS_VER).tar.gz | $(TARGETPREFIX)
 			--enable-symlink-build \
 			--with-gnu-ld && \
 		$(MAKE) && \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX) && \
+		$(MAKE) install DESTDIR=$(TARGET_DIR) && \
 		cd lib/uuid/ && \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/uuid.pc
 	$(REMOVE)/e2fsprogs-$(E2FSPROGS_VER)
-	cd $(TARGETPREFIX) && rm sbin/dumpe2fs sbin/logsave sbin/e2undo \
+	cd $(TARGET_DIR) && rm sbin/dumpe2fs sbin/logsave sbin/e2undo \
 		sbin/filefrag sbin/e2freefrag bin/chattr bin/lsattr bin/uuidgen
 	touch $@
-$(D)/ntfs-3g: $(ARCHIVE)/ntfs-3g_ntfsprogs-$(NTFS3G_VER).tgz | $(TARGETPREFIX)
+$(D)/ntfs-3g: $(ARCHIVE)/ntfs-3g_ntfsprogs-$(NTFS3G_VER).tgz | $(TARGET_DIR)
 	$(UNTAR)/ntfs-3g_ntfsprogs-$(NTFS3G_VER).tgz
 	cd $(BUILD_TMP)/ntfs-3g_ntfsprogs-$(NTFS3G_VER) && \
 		$(CONFIGURE) \
@ -448,13 +448,13 @@ $(D)/ntfs-3g: $(ARCHIVE)/ntfs-3g_ntfsprogs-$(NTFS3G_VER).tgz | $(TARGETPREFIX)
 			--disable-library \
 			&& \
 		$(MAKE) && \
-	install -m 755 $(BUILD_TMP)/ntfs-3g_ntfsprogs-$(NTFS3G_VER)/src/ntfs-3g $(TARGETPREFIX)/sbin/ntfs-3g
+	install -m 755 $(BUILD_TMP)/ntfs-3g_ntfsprogs-$(NTFS3G_VER)/src/ntfs-3g $(TARGET_DIR)/sbin/ntfs-3g
 	$(REMOVE)/ntfs-3g_ntfsprogs-$(NTFS3G_VER)
 	touch $@
 # the 'autofs-use-pkg-config' patch for libtirpc link should hopefully be added upstream soon
 # see: https://patchwork.ozlabs.org/patch/782714/
-$(D)/autofs5: $(D)/libtirpc $(ARCHIVE)/autofs-$(AUTOFS5_VER).tar.gz | $(TARGETPREFIX)
+$(D)/autofs5: $(D)/libtirpc $(ARCHIVE)/autofs-$(AUTOFS5_VER).tar.gz | $(TARGET_DIR)
 	$(REMOVE)/autofs-$(AUTOFS5_VER)
 	$(UNTAR)/autofs-$(AUTOFS5_VER).tar.gz
 	cd $(BUILD_TMP)/autofs-$(AUTOFS5_VER) && \
@ -482,16 +482,16 @@ $(D)/autofs5: $(D)/libtirpc $(ARCHIVE)/autofs-$(AUTOFS5_VER).tar.gz | $(TARGETPR
 			&& \
 		sed -i "s|nfs/nfs.h|linux/nfs.h|" include/rpc_subs.h && \
 		$(MAKE) SUBDIRS="lib daemon modules" DONTSTRIP=1 && \
-		$(MAKE) SUBDIRS="lib daemon modules" install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) SUBDIRS="lib daemon modules" install DESTDIR=$(TARGET_DIR)
-	cp -a $(IMAGEFILES)/autofs/* $(TARGETPREFIX)/
+	cp -a $(IMAGEFILES)/autofs/* $(TARGET_DIR)/
-	ln -sf autofs $(TARGETPREFIX)/etc/init.d/S60autofs
+	ln -sf autofs $(TARGET_DIR)/etc/init.d/S60autofs
-	ln -sf autofs $(TARGETPREFIX)/etc/init.d/K40autofs
+	ln -sf autofs $(TARGET_DIR)/etc/init.d/K40autofs
 	$(REMOVE)/autofs-$(AUTOFS5_VER)
 	touch $@
 samba: samba-$(BOXSERIES)
-$(D)/samba-hd1: $(D)/zlib $(ARCHIVE)/samba-$(SAMBA33_VER).tar.gz | $(TARGETPREFIX)
+$(D)/samba-hd1: $(D)/zlib $(ARCHIVE)/samba-$(SAMBA33_VER).tar.gz | $(TARGET_DIR)
 	$(UNTAR)/samba-$(SAMBA33_VER).tar.gz
 	cd $(BUILD_TMP)/samba-$(SAMBA33_VER) && \
 	$(PATCH)/samba33-build-only-what-we-need.patch && \
@ -535,22 +535,22 @@ $(D)/samba-hd1: $(D)/zlib $(ARCHIVE)/samba-$(SAMBA33_VER).tar.gz | $(TARGETPREFI
 			--disable-relro \
 			--disable-swat && \
 		$(MAKE) all && \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	mkdir -p $(TARGETPREFIX)/var/samba/locks
+	mkdir -p $(TARGET_DIR)/var/samba/locks
-	install $(IMAGEFILES)/scripts/smb3.conf $(TARGETPREFIX)/etc/samba/smb.conf
+	install $(IMAGEFILES)/scripts/smb3.conf $(TARGET_DIR)/etc/samba/smb.conf
-	install -m 755 $(IMAGEFILES)/scripts/samba3.init $(TARGETPREFIX)/etc/init.d/samba
+	install -m 755 $(IMAGEFILES)/scripts/samba3.init $(TARGET_DIR)/etc/init.d/samba
-	ln -sf samba $(TARGETPREFIX)/etc/init.d/S99samba
+	ln -sf samba $(TARGET_DIR)/etc/init.d/S99samba
-	ln -sf samba $(TARGETPREFIX)/etc/init.d/K01samba
+	ln -sf samba $(TARGET_DIR)/etc/init.d/K01samba
-	rm -rf $(TARGETPREFIX)/bin/testparm
+	rm -rf $(TARGET_DIR)/bin/testparm
-	rm -rf $(TARGETPREFIX)/bin/findsmb
+	rm -rf $(TARGET_DIR)/bin/findsmb
-	rm -rf $(TARGETPREFIX)/bin/smbtar
+	rm -rf $(TARGET_DIR)/bin/smbtar
-	rm -rf $(TARGETPREFIX)/bin/smbclient
+	rm -rf $(TARGET_DIR)/bin/smbclient
-	rm -rf $(TARGETPREFIX)/bin/smbpasswd
+	rm -rf $(TARGET_DIR)/bin/smbpasswd
 	$(REMOVE)/samba-$(SAMBA33_VER)
 	touch $@
 $(D)/samba-hd51 \
-$(D)/samba-hd2: $(D)/zlib $(ARCHIVE)/samba-$(SAMBA36_VER).tar.gz | $(TARGETPREFIX)
+$(D)/samba-hd2: $(D)/zlib $(ARCHIVE)/samba-$(SAMBA36_VER).tar.gz | $(TARGET_DIR)
 	$(UNTAR)/samba-$(SAMBA36_VER).tar.gz
 	cd $(BUILD_TMP)/samba-$(SAMBA36_VER) && \
 	$(PATCH)/samba36-build-only-what-we-need.patch && \
@ -600,21 +600,21 @@ $(D)/samba-hd2: $(D)/zlib $(ARCHIVE)/samba-$(SAMBA36_VER).tar.gz | $(TARGETPREFI
 			--disable-relro \
 			--disable-swat && \
 		$(MAKE) all && \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	mkdir -p $(TARGETPREFIX)/var/samba/locks
+	mkdir -p $(TARGET_DIR)/var/samba/locks
-	install $(IMAGEFILES)/scripts/smb3.conf $(TARGETPREFIX)/etc/samba/smb.conf
+	install $(IMAGEFILES)/scripts/smb3.conf $(TARGET_DIR)/etc/samba/smb.conf
-	install -m 755 $(IMAGEFILES)/scripts/samba3.init $(TARGETPREFIX)/etc/init.d/samba
+	install -m 755 $(IMAGEFILES)/scripts/samba3.init $(TARGET_DIR)/etc/init.d/samba
-	ln -sf samba $(TARGETPREFIX)/etc/init.d/S99samba
+	ln -sf samba $(TARGET_DIR)/etc/init.d/S99samba
-	ln -sf samba $(TARGETPREFIX)/etc/init.d/K01samba
+	ln -sf samba $(TARGET_DIR)/etc/init.d/K01samba
-	rm -rf $(TARGETPREFIX)/bin/testparm
+	rm -rf $(TARGET_DIR)/bin/testparm
-	rm -rf $(TARGETPREFIX)/bin/findsmb
+	rm -rf $(TARGET_DIR)/bin/findsmb
-	rm -rf $(TARGETPREFIX)/bin/smbtar
+	rm -rf $(TARGET_DIR)/bin/smbtar
-	rm -rf $(TARGETPREFIX)/bin/smbclient
+	rm -rf $(TARGET_DIR)/bin/smbclient
-	rm -rf $(TARGETPREFIX)/bin/smbpasswd
+	rm -rf $(TARGET_DIR)/bin/smbpasswd
 	$(REMOVE)/samba-$(SAMBA36_VER)
 	touch $@
-$(D)/dropbear: $(D)/zlib $(ARCHIVE)/dropbear-$(DROPBEAR_VER).tar.bz2 | $(TARGETPREFIX)
+$(D)/dropbear: $(D)/zlib $(ARCHIVE)/dropbear-$(DROPBEAR_VER).tar.bz2 | $(TARGET_DIR)
 	$(UNTAR)/dropbear-$(DROPBEAR_VER).tar.bz2
 	cd $(BUILD_TMP)/dropbear-$(DROPBEAR_VER) && \
 		$(PATCH)/dropbear-fix-paths.patch && \
@ -630,30 +630,30 @@ $(D)/dropbear: $(D)/zlib $(ARCHIVE)/dropbear-$(DROPBEAR_VER).tar.bz2 | $(TARGETP
 		sed -i 's:.*\(#define NO_FAST_EXPTMOD\).*:\1:' options.h && \
 		sed -i 's:^#define DROPBEAR_SMALL_CODE::' options.h && \
 		$(MAKE) PROGRAMS="dropbear dbclient dropbearkey scp" SCPPROGRESS=1 && \
-		$(MAKE) PROGRAMS="dropbear dbclient dropbearkey scp" install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) PROGRAMS="dropbear dbclient dropbearkey scp" install DESTDIR=$(TARGET_DIR)
-	install -D -m 0755 $(IMAGEFILES)/scripts/dropbear.init $(TARGETPREFIX)/etc/init.d/dropbear
+	install -D -m 0755 $(IMAGEFILES)/scripts/dropbear.init $(TARGET_DIR)/etc/init.d/dropbear
-	install -d -m 0755 $(TARGETPREFIX)/etc/dropbear
+	install -d -m 0755 $(TARGET_DIR)/etc/dropbear
-	ln -sf dropbear $(TARGETPREFIX)/etc/init.d/S60dropbear
+	ln -sf dropbear $(TARGET_DIR)/etc/init.d/S60dropbear
-	ln -sf dropbear $(TARGETPREFIX)/etc/init.d/K60dropbear
+	ln -sf dropbear $(TARGET_DIR)/etc/init.d/K60dropbear
 	$(REMOVE)/dropbear-$(DROPBEAR_VER)
 	touch $@
-$(D)/sg3-utils: $(ARCHIVE)/sg3_utils-$(SG3-UTILS_VER).tar.xz | $(TARGETPREFIX)
+$(D)/sg3-utils: $(ARCHIVE)/sg3_utils-$(SG3-UTILS_VER).tar.xz | $(TARGET_DIR)
 	$(UNTAR)/sg3_utils-$(SG3-UTILS_VER).tar.xz
 	cd $(BUILD_TMP)/sg3_utils-$(SG3-UTILS_VER) && \
 		$(CONFIGURE) \
 			--prefix= \
 			--mandir=/.remove && \
 		$(MAKE) && \
-		cp -a src/.libs/sg_start $(TARGETPREFIX)/bin && \
+		cp -a src/.libs/sg_start $(TARGET_DIR)/bin && \
 		cp -a lib/.libs/libsgutils2.so.2.0.0 $(TARGETLIB) && \
 		cp -a lib/.libs/libsgutils2.so.2 $(TARGETLIB) && \
 		cp -a lib/.libs/libsgutils2.so $(TARGETLIB)
 	$(REMOVE)/sg3_utils-$(SG3-UTILS_VER)
 	touch $@
-fbshot: $(TARGETPREFIX)/bin/fbshot
+fbshot: $(TARGET_DIR)/bin/fbshot
-$(TARGETPREFIX)/bin/fbshot: $(D)/libpng $(ARCHIVE)/fbshot-$(FBSHOT_VER).tar.gz | $(TARGETPREFIX)
+$(TARGET_DIR)/bin/fbshot: $(D)/libpng $(ARCHIVE)/fbshot-$(FBSHOT_VER).tar.gz | $(TARGET_DIR)
 	$(REMOVE)/fbshot-$(FBSHOT_VER)
 	$(UNTAR)/fbshot-$(FBSHOT_VER).tar.gz
 	cd $(BUILD_TMP)/fbshot-$(FBSHOT_VER); \
@ -662,7 +662,7 @@ $(TARGETPREFIX)/bin/fbshot: $(D)/libpng $(ARCHIVE)/fbshot-$(FBSHOT_VER).tar.gz |
 		$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) fbshot.c -lpng -lz -o $@
 	$(REMOVE)/fbshot-$(FBSHOT_VER)
-$(D)/lcd4linux: $(D)/libncurses $(D)/libgd2 $(D)/libdpf | $(TARGETPREFIX)
+$(D)/lcd4linux: $(D)/libncurses $(D)/libgd2 $(D)/libdpf | $(TARGET_DIR)
 	$(REMOVE)/lcd4linux
 	git clone https://github.com/TangoCash/lcd4linux.git $(BUILD_TMP)/lcd4linux
 	cd $(BUILD_TMP)/lcd4linux && \
@ -670,7 +670,7 @@ $(D)/lcd4linux: $(D)/libncurses $(D)/libgd2 $(D)/libdpf | $(TARGETPREFIX)
 		$(CONFIGURE) \
 			--libdir=$(TARGETLIB) \
 			--includedir=$(TARGETINCLUDE) \
-			--bindir=$(TARGETPREFIX)/bin \
+			--bindir=$(TARGET_DIR)/bin \
 			--prefix= \
 			--mandir=/.remove \
 			--docdir=/.remove \
@ -684,19 +684,19 @@ $(D)/lcd4linux: $(D)/libncurses $(D)/libgd2 $(D)/libdpf | $(TARGETPREFIX)
 	$(REMOVE)/lcd4linux
 	touch $@
-$(D)/wpa_supplicant: $(D)/openssl $(ARCHIVE)/wpa_supplicant-$(WPA_SUPP_VER).tar.gz | $(TARGETPREFIX)
+$(D)/wpa_supplicant: $(D)/openssl $(ARCHIVE)/wpa_supplicant-$(WPA_SUPP_VER).tar.gz | $(TARGET_DIR)
 	$(UNTAR)/wpa_supplicant-$(WPA_SUPP_VER).tar.gz
 	pushd $(BUILD_TMP)/wpa_supplicant-$(WPA_SUPP_VER)/wpa_supplicant && \
 		cp $(CONFIGS)/wpa_supplicant.config .config && \
 		CC=$(TARGET)-gcc CFLAGS="$(TARGET_CFLAGS)" CXXFLAGS="$(TARGET_CXXFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" \
 		$(MAKE)
-	cp -f $(BUILD_TMP)/wpa_supplicant-$(WPA_SUPP_VER)/wpa_supplicant/wpa_cli $(TARGETPREFIX)/sbin/wpa_cli
+	cp -f $(BUILD_TMP)/wpa_supplicant-$(WPA_SUPP_VER)/wpa_supplicant/wpa_cli $(TARGET_DIR)/sbin/wpa_cli
-	cp -f $(BUILD_TMP)/wpa_supplicant-$(WPA_SUPP_VER)/wpa_supplicant/wpa_passphrase $(TARGETPREFIX)/sbin/wpa_passphrase
+	cp -f $(BUILD_TMP)/wpa_supplicant-$(WPA_SUPP_VER)/wpa_supplicant/wpa_passphrase $(TARGET_DIR)/sbin/wpa_passphrase
-	cp -f $(BUILD_TMP)/wpa_supplicant-$(WPA_SUPP_VER)/wpa_supplicant/wpa_supplicant $(TARGETPREFIX)/sbin/wpa_supplicant
+	cp -f $(BUILD_TMP)/wpa_supplicant-$(WPA_SUPP_VER)/wpa_supplicant/wpa_supplicant $(TARGET_DIR)/sbin/wpa_supplicant
 	$(REMOVE)/wpa_supplicant-$(WPA_SUPP_VER)
 	touch $@
-$(D)/xupnpd: $(D)/lua $(D)/openssl | $(TARGETPREFIX)
+$(D)/xupnpd: $(D)/lua $(D)/openssl | $(TARGET_DIR)
 	$(REMOVE)/xupnpd
 	git clone https://github.com/clark15b/xupnpd.git $(BUILD_TMP)/xupnpd
 	pushd $(BUILD_TMP)/xupnpd && \
@ -709,26 +709,26 @@ $(D)/xupnpd: $(D)/lua $(D)/openssl | $(TARGETPREFIX)
 		$(BUILDENV) \
 		$(MAKE) embedded TARGET=$(TARGET) CC=$(TARGET)-gcc STRIP=$(TARGET)-strip LUAFLAGS="$(TARGET_LDFLAGS) -I$(TARGETINCLUDE)" && \
 	install -D -m 0755 xupnpd $(BIN)/ && \
-	mkdir -p $(TARGETPREFIX)/share/xupnpd/config && \
+	mkdir -p $(TARGET_DIR)/share/xupnpd/config && \
 	for object in *.lua plugins/ profiles/ ui/ www/; do \
-		cp -a $$object $(TARGETPREFIX)/share/xupnpd/; \
+		cp -a $$object $(TARGET_DIR)/share/xupnpd/; \
 	done;
-	rm $(TARGETPREFIX)/share/xupnpd/plugins/staff/xupnpd_18plus.lua
+	rm $(TARGET_DIR)/share/xupnpd/plugins/staff/xupnpd_18plus.lua
-	install -D -m 644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_18plus.lua $(TARGETPREFIX)/share/xupnpd/plugins/
+	install -D -m 644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_18plus.lua $(TARGET_DIR)/share/xupnpd/plugins/
-	install -D -m 644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_youtube.lua $(TARGETPREFIX)/share/xupnpd/plugins/
+	install -D -m 644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_youtube.lua $(TARGET_DIR)/share/xupnpd/plugins/
-	install -D -m 644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_coolstream.lua $(TARGETPREFIX)/share/xupnpd/plugins/
+	install -D -m 644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_coolstream.lua $(TARGET_DIR)/share/xupnpd/plugins/
-	install -D -m 644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_cczwei.lua $(TARGETPREFIX)/share/xupnpd/plugins/
+	install -D -m 644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_cczwei.lua $(TARGET_DIR)/share/xupnpd/plugins/
-	mkdir -p $(TARGETPREFIX)/etc/init.d/
+	mkdir -p $(TARGET_DIR)/etc/init.d/
-		install -D -m 0755 $(IMAGEFILES)/scripts/xupnpd.init $(TARGETPREFIX)/etc/init.d/xupnpd
+		install -D -m 0755 $(IMAGEFILES)/scripts/xupnpd.init $(TARGET_DIR)/etc/init.d/xupnpd
-		ln -sf xupnpd $(TARGETPREFIX)/etc/init.d/S99xupnpd
+		ln -sf xupnpd $(TARGET_DIR)/etc/init.d/S99xupnpd
-		ln -sf xupnpd $(TARGETPREFIX)/etc/init.d/K01xupnpd
+		ln -sf xupnpd $(TARGET_DIR)/etc/init.d/K01xupnpd
-	cp -a $(IMAGEFILES)/xupnpd/* $(TARGETPREFIX)/
+	cp -a $(IMAGEFILES)/xupnpd/* $(TARGET_DIR)/
 	$(REMOVE)/xupnpd
 	touch $@
 DOSFSTOOLS_CFLAGS = $(TARGET_CFLAGS) -D_GNU_SOURCE -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
-$(D)/dosfstools: $(DOSFSTOOLS_DEPS) $(ARCHIVE)/dosfstools-$(DOSFSTOOLS_VER).tar.xz | $(TARGETPREFIX)
+$(D)/dosfstools: $(DOSFSTOOLS_DEPS) $(ARCHIVE)/dosfstools-$(DOSFSTOOLS_VER).tar.xz | $(TARGET_DIR)
 	$(REMOVE)/dosfstools-$(DOSFSTOOLS_VER)
 	$(UNTAR)/dosfstools-$(DOSFSTOOLS_VER).tar.xz
 	set -e; cd $(BUILD_TMP)/dosfstools-$(DOSFSTOOLS_VER); \
@ -742,7 +742,7 @@ $(D)/dosfstools: $(DOSFSTOOLS_DEPS) $(ARCHIVE)/dosfstools-$(DOSFSTOOLS_VER).tar.
 			CFLAGS="$(DOSFSTOOLS_CFLAGS)" \
 		; \
 		$(MAKE); \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REMOVE)/dosfstools-$(DOSFSTOOLS_VER)
 	touch $@
@ -751,7 +751,7 @@ ifeq ($(BOXSERIES), hd1)
 	NFS-UTILS_IPV6=--disable-ipv6
 endif
-$(D)/nfs-utils: $(D)/rpcbind $(ARCHIVE)/nfs-utils-$(NFS-UTILS_VER).tar.bz2 | $(TARGETPREFIX)
+$(D)/nfs-utils: $(D)/rpcbind $(ARCHIVE)/nfs-utils-$(NFS-UTILS_VER).tar.bz2 | $(TARGET_DIR)
 	$(UNTAR)/nfs-utils-$(NFS-UTILS_VER).tar.bz2
 	pushd $(BUILD_TMP)/nfs-utils-$(NFS-UTILS_VER) && \
 	$(PATCH)/nfs-utils_01-Patch-taken-from-Gentoo.patch && \
@ -778,23 +778,23 @@ $(D)/nfs-utils: $(D)/rpcbind $(ARCHIVE)/nfs-utils-$(NFS-UTILS_VER).tar.bz2 | $(T
 			--without-systemd \
 			; \
 		$(MAKE) && \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	chmod 755 $(TARGETPREFIX)/sbin/mount.nfs
+	chmod 755 $(TARGET_DIR)/sbin/mount.nfs
-	rm -rf $(TARGETPREFIX)/sbin/mountstats
+	rm -rf $(TARGET_DIR)/sbin/mountstats
-	rm -rf $(TARGETPREFIX)/sbin/nfsiostat
+	rm -rf $(TARGET_DIR)/sbin/nfsiostat
-	rm -rf $(TARGETPREFIX)/sbin/osd_login
+	rm -rf $(TARGET_DIR)/sbin/osd_login
-	rm -rf $(TARGETPREFIX)/sbin/start-statd
+	rm -rf $(TARGET_DIR)/sbin/start-statd
-	rm -rf $(TARGETPREFIX)/sbin/mount.nfs*
+	rm -rf $(TARGET_DIR)/sbin/mount.nfs*
-	rm -rf $(TARGETPREFIX)/sbin/umount.nfs*
+	rm -rf $(TARGET_DIR)/sbin/umount.nfs*
-	rm -rf $(TARGETPREFIX)/sbin/showmount
+	rm -rf $(TARGET_DIR)/sbin/showmount
-	rm -rf $(TARGETPREFIX)/sbin/rpcdebug
+	rm -rf $(TARGET_DIR)/sbin/rpcdebug
-	install -m 755 -D $(IMAGEFILES)/scripts/nfsd.init $(TARGETPREFIX)/etc/init.d/nfsd
+	install -m 755 -D $(IMAGEFILES)/scripts/nfsd.init $(TARGET_DIR)/etc/init.d/nfsd
-	ln -s nfsd $(TARGETPREFIX)/etc/init.d/S60nfsd
+	ln -s nfsd $(TARGET_DIR)/etc/init.d/S60nfsd
-	ln -s nfsd $(TARGETPREFIX)/etc/init.d/K01nfsd
+	ln -s nfsd $(TARGET_DIR)/etc/init.d/K01nfsd
 	$(REMOVE)/nfs-utils-$(NFS-UTILS_VER)
 	touch $@
-$(D)/rpcbind: $(D)/libtirpc $(ARCHIVE)/rpcbind-$(RPCBIND_VER).tar.bz2 | $(TARGETPREFIX)
+$(D)/rpcbind: $(D)/libtirpc $(ARCHIVE)/rpcbind-$(RPCBIND_VER).tar.bz2 | $(TARGET_DIR)
 	$(UNTAR)/rpcbind-$(RPCBIND_VER).tar.bz2
 	cd $(BUILD_TMP)/rpcbind-$(RPCBIND_VER) && \
 	$(PATCH)/rpcbind-0001-Remove-yellow-pages-support.patch && \
@ -807,15 +807,15 @@ $(D)/rpcbind: $(D)/libtirpc $(ARCHIVE)/rpcbind-$(RPCBIND_VER).tar.bz2 | $(TARGET
 			--with-systemdsystemunitdir=no \
 			--mandir=/.remove && \
 		$(MAKE) && \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
 ifeq ($(BOXSERIES), hd1)
-		sed -i -e '/^\(udp\|tcp\)6/ d' $(TARGETPREFIX)/etc/netconfig
+		sed -i -e '/^\(udp\|tcp\)6/ d' $(TARGET_DIR)/etc/netconfig
 endif
-	rm -rf $(TARGETPREFIX)/bin/rpcgen
+	rm -rf $(TARGET_DIR)/bin/rpcgen
 	$(REMOVE)/rpcbind-$(RPCBIND_VER)
 	touch $@
-$(D)/fuse-exfat: $(ARCHIVE)/fuse-exfat-$(FUSE_EXFAT_VER).tar.gz $(D)/libfuse | $(TARGETPREFIX)
+$(D)/fuse-exfat: $(ARCHIVE)/fuse-exfat-$(FUSE_EXFAT_VER).tar.gz $(D)/libfuse | $(TARGET_DIR)
 	$(REMOVE)/fuse-exfat-$(FUSE_EXFAT_VER)
 	$(UNTAR)/fuse-exfat-$(FUSE_EXFAT_VER).tar.gz
 	pushd $(BUILD_TMP)/fuse-exfat-$(FUSE_EXFAT_VER); \
@ -826,11 +826,11 @@ $(D)/fuse-exfat: $(ARCHIVE)/fuse-exfat-$(FUSE_EXFAT_VER).tar.gz $(D)/libfuse | $
 			--mandir=/.remove \
 			; \
 		$(MAKE); \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REMOVE)/fuse-exfat-$(FUSE_EXFAT_VER)
 	touch $@
-$(D)/exfat-utils: $(ARCHIVE)/exfat-utils-$(EXFAT_UTILS_VER).tar.gz $(D)/fuse-exfat | $(TARGETPREFIX)
+$(D)/exfat-utils: $(ARCHIVE)/exfat-utils-$(EXFAT_UTILS_VER).tar.gz $(D)/fuse-exfat | $(TARGET_DIR)
 	$(REMOVE)/exfat-utils-$(EXFAT_UTILS_VER)
 	$(UNTAR)/exfat-utils-$(EXFAT_UTILS_VER).tar.gz
 	pushd $(BUILD_TMP)/exfat-utils-$(EXFAT_UTILS_VER); \
@ -841,29 +841,29 @@ $(D)/exfat-utils: $(ARCHIVE)/exfat-utils-$(EXFAT_UTILS_VER).tar.gz $(D)/fuse-exf
 			--mandir=/.remove \
 			; \
 		$(MAKE); \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REMOVE)/exfat-utils-$(EXFAT_UTILS_VER)
 	touch $@
-$(D)/streamripper: $(D)/libvorbisidec $(D)/libmad $(D)/libglib2 | $(TARGETPREFIX)
+$(D)/streamripper: $(D)/libvorbisidec $(D)/libmad $(D)/libglib2 | $(TARGET_DIR)
 	$(REMOVE)/$(NI_STREAMRIPPER)
 	tar -C $(SOURCE_DIR) -cp $(NI_STREAMRIPPER) --exclude-vcs | tar -C $(BUILD_TMP) -x
 	pushd $(BUILD_TMP)/$(NI_STREAMRIPPER); \
 		autoreconf -fi; \
 		$(CONFIGURE) \
 			--prefix= \
-			--includedir=$(TARGETPREFIX)/include \
+			--includedir=$(TARGET_DIR)/include \
 			--datarootdir=/.remove \
 			--with-included-argv=yes \
 			--with-included-libmad=no \
 			; \
 		$(MAKE); \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	install -m755 $(IMAGEFILES)/scripts/streamripper.sh $(TARGETPREFIX)/bin/
+	install -m755 $(IMAGEFILES)/scripts/streamripper.sh $(TARGET_DIR)/bin/
 	$(REMOVE)/$(NI_STREAMRIPPER)
 	touch $@
-$(D)/gettext: $(ARCHIVE)/gettext-$(GETTEXT_VERSION).tar.xz | $(TARGETPREFIX)
+$(D)/gettext: $(ARCHIVE)/gettext-$(GETTEXT_VERSION).tar.xz | $(TARGET_DIR)
 	$(UNTAR)/gettext-$(GETTEXT_VERSION).tar.xz
 	pushd $(BUILD_TMP)/gettext-$(GETTEXT_VERSION)/gettext-runtime; \
 		autoreconf -fi; \
@ -880,16 +880,16 @@ $(D)/gettext: $(ARCHIVE)/gettext-$(GETTEXT_VERSION).tar.xz | $(TARGETPREFIX)
 			--without-emacs \
 			; \
 		$(MAKE); \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	rm -rf $(TARGETPREFIX)/bin/envsubst
+	rm -rf $(TARGET_DIR)/bin/envsubst
-	rm -rf $(TARGETPREFIX)/bin/gettext
+	rm -rf $(TARGET_DIR)/bin/gettext
-	rm -rf $(TARGETPREFIX)/bin/gettext.sh
+	rm -rf $(TARGET_DIR)/bin/gettext.sh
-	rm -rf $(TARGETPREFIX)/bin/ngettext
+	rm -rf $(TARGET_DIR)/bin/ngettext
 	$(REWRITE_LIBTOOL)/libintl.la
 	$(REMOVE)/gettext-$(GETTEXT_VERSION)
 	touch $@
-$(D)/mc: $(ARCHIVE)/mc-$(MC_VER).tar.xz $(D)/libglib2 $(D)/libncurses | $(TARGETPREFIX)
+$(D)/mc: $(ARCHIVE)/mc-$(MC_VER).tar.xz $(D)/libglib2 $(D)/libncurses | $(TARGET_DIR)
 	$(REMOVE)/mc-$(MC_VER)
 	$(UNTAR)/mc-$(MC_VER).tar.xz
 	pushd $(BUILD_TMP)/mc-$(MC_VER); \
@ -911,13 +911,13 @@ $(D)/mc: $(ARCHIVE)/mc-$(MC_VER).tar.xz $(D)/libglib2 $(D)/libncurses | $(TARGET
 			--without-x \
 		; \
 		$(MAKE) all; \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	rm -rf $(TARGETPREFIX)/share/mc/examples
+	rm -rf $(TARGET_DIR)/share/mc/examples
-	find $(TARGETPREFIX)/share/mc/skins -type f ! -name default.ini | xargs --no-run-if-empty rm
+	find $(TARGET_DIR)/share/mc/skins -type f ! -name default.ini | xargs --no-run-if-empty rm
 	$(REMOVE)/mc-$(MC_VER)
 	touch $@
-$(D)/wget: $(D)/openssl $(ARCHIVE)/wget-$(WGET_VER).tar.gz | $(TARGETPREFIX)
+$(D)/wget: $(D)/openssl $(ARCHIVE)/wget-$(WGET_VER).tar.gz | $(TARGET_DIR)
 	$(REMOVE)/wget-$(WGET_VER)
 	$(UNTAR)/wget-$(WGET_VER).tar.gz
 	cd $(BUILD_TMP)/wget-$(WGET_VER) && \
@ -936,13 +936,13 @@ $(D)/wget: $(D)/openssl $(ARCHIVE)/wget-$(WGET_VER).tar.gz | $(TARGETPREFIX)
 			--disable-debug \
 			&& \
 		$(MAKE) && \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REMOVE)/wget-$(WGET_VER)
 	touch $@
 # builds only stripped down iconv binary
 # used for smarthomeinfo plugin
-$(D)/iconv: $(ARCHIVE)/libiconv-$(LIBICONV_VER).tar.gz | $(TARGETPREFIX)
+$(D)/iconv: $(ARCHIVE)/libiconv-$(LIBICONV_VER).tar.gz | $(TARGET_DIR)
 	$(UNTAR)/libiconv-$(LIBICONV_VER).tar.gz
 	pushd $(BUILD_TMP)/libiconv-$(LIBICONV_VER) && \
 	$(PATCH)/iconv-disable_transliterations.patch && \
@ -956,23 +956,23 @@ $(D)/iconv: $(ARCHIVE)/libiconv-$(LIBICONV_VER).tar.gz | $(TARGETPREFIX)
 			--datarootdir=/.remove && \
 		$(MAKE) && \
 	$(MAKE) install DESTDIR=$(BUILD_TMP)/libiconv-$(LIBICONV_VER)/tmp
-	cp -a $(BUILD_TMP)/libiconv-$(LIBICONV_VER)/tmp/bin/iconv $(TARGETPREFIX)/bin
+	cp -a $(BUILD_TMP)/libiconv-$(LIBICONV_VER)/tmp/bin/iconv $(TARGET_DIR)/bin
 	$(REMOVE)/libiconv-$(LIBICONV_VER)
 	touch $@
-$(D)/ofgwrite: $(SOURCE_DIR)/$(NI_OFGWRITE) | $(TARGETPREFIX)
+$(D)/ofgwrite: $(SOURCE_DIR)/$(NI_OFGWRITE) | $(TARGET_DIR)
 	$(REMOVE)/$(NI_OFGWRITE)
 	tar -C $(SOURCE_DIR) -cp $(NI_OFGWRITE) --exclude-vcs | tar -C $(BUILD_TMP) -x
 	cd $(BUILD_TMP)/$(NI_OFGWRITE); \
 		$(BUILDENV) \
 		$(MAKE) && \
-	install -m 755 $(BUILD_TMP)/$(NI_OFGWRITE)/ofgwrite_bin $(TARGETPREFIX)/bin
+	install -m 755 $(BUILD_TMP)/$(NI_OFGWRITE)/ofgwrite_bin $(TARGET_DIR)/bin
-	install -m 755 $(BUILD_TMP)/$(NI_OFGWRITE)/ofgwrite_tgz $(TARGETPREFIX)/bin
+	install -m 755 $(BUILD_TMP)/$(NI_OFGWRITE)/ofgwrite_tgz $(TARGET_DIR)/bin
-	install -m 755 $(BUILD_TMP)/$(NI_OFGWRITE)/ofgwrite $(TARGETPREFIX)/bin
+	install -m 755 $(BUILD_TMP)/$(NI_OFGWRITE)/ofgwrite $(TARGET_DIR)/bin
 	$(REMOVE)/$(NI_OFGWRITE)
 	touch $@
-$(D)/aio-grab: $(D)/zlib $(D)/libpng $(D)/libjpeg | $(TARGETPREFIX)
+$(D)/aio-grab: $(D)/zlib $(D)/libpng $(D)/libjpeg | $(TARGET_DIR)
 	$(REMOVE)/aio-grab
 	cd $(BUILD_TMP); \
 	git clone git://github.com/oe-alliance/aio-grab.git aio-grab; \
@ -987,10 +987,10 @@ $(D)/aio-grab: $(D)/zlib $(D)/libpng $(D)/libjpeg | $(TARGETPREFIX)
 			--enable-silent-rules \
 		; \
 		$(MAKE) all; \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REMOVE)/aio-grab
 	touch $@
-$(D)/ca-bundle: $(ARCHIVE)/cacert.pem | $(TARGETPREFIX)
+$(D)/ca-bundle: $(ARCHIVE)/cacert.pem | $(TARGET_DIR)
-	install -D -m 644 $(ARCHIVE)/cacert.pem $(TARGETPREFIX)/$(CA_BUNDLE_DIR)/$(CA_BUNDLE)
+	install -D -m 644 $(ARCHIVE)/cacert.pem $(TARGET_DIR)/$(CA_BUNDLE_DIR)/$(CA_BUNDLE)
 	touch $@