diff --git a/make/bootstrap.mk b/make/bootstrap.mk
index 8bd4e689..abe8f35b 100644
--- a/make/bootstrap.mk
+++ b/make/bootstrap.mk
@@ -73,57 +73,57 @@ $(STAGING_DIR) \
 $(IMAGE_DIR) \
 $(UPDATE_DIR) \
 $(HOST_DIR):
-	mkdir -p $@
+	mkdir -p $(@)
 
 $(HOST_DIR)/bin: $(HOST_DIR)
-	mkdir -p $@
+	mkdir -p $(@)
 
 $(TARGET_BIN_DIR): | $(TARGET_DIR)
-	mkdir -p $@
+	mkdir -p $(@)
 
 $(TARGET_INCLUDE_DIR): | $(TARGET_DIR)
-	mkdir -p $@
+	mkdir -p $(@)
 ifeq ($(BOXTYPE), armbox)
-	cp -a $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/include/. $@
+	cp -a $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/include/. $(@)
 endif
 
 $(TARGET_LIB_DIR): | $(TARGET_DIR)
-	mkdir -p $@
-	cp -a $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/lib/. $@
+	mkdir -p $(@)
+	cp -a $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/lib/. $(@)
 ifeq ($(BOXTYPE), coolstream)
-	cp -a $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/libcoolstream/$(shell echo -n $(NI-FFMPEG_BRANCH) | sed 's,/,-,g')/. $@
+	cp -a $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/libcoolstream/$(shell echo -n $(NI-FFMPEG_BRANCH) | sed 's,/,-,g')/. $(@)
   ifeq ($(BOXSERIES), hd1)
-	ln -sf libnxp.so $@/libconexant.so
+	ln -sf libnxp.so $(@)/libconexant.so
   endif
 endif
 
 $(TARGET_LIB_DIR)/firmware: | $(TARGET_DIR)
-	mkdir -p $@
-	cp -a $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/lib-firmware/. $@
-	cp -a $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/lib-firmware-dvb/. $@
-	cp -a $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/lib-firmware-rt/. $@
+	mkdir -p $(@)
+	cp -a $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/lib-firmware/. $(@)
+	cp -a $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/lib-firmware-dvb/. $(@)
+	cp -a $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/lib-firmware-rt/. $(@)
 
 $(TARGET_LIB_DIR)/modules: | $(TARGET_DIR)
-	mkdir -p $@
-	cp -a $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/lib-modules/$(KERNEL_VERSION) $@
+	mkdir -p $(@)
+	cp -a $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/lib-modules/$(KERNEL_VERSION) $(@)
 ifeq ($(BOXMODEL), nevis)
-	ln -sf $(KERNEL_VERSION) $@/$(KERNEL_VERSION)-$(BOXMODEL)
+	ln -sf $(KERNEL_VERSION) $(@)/$(KERNEL_VERSION)-$(BOXMODEL)
 endif
 
 $(STATIC_LIB_DIR): | $(TARGET_DIR)
-	mkdir -p $@
+	mkdir -p $(@)
 	if [ -d $(STATIC_DIR)/ ]; then \
 		cp -a $(STATIC_DIR)/. $(TARGET_DIR)/; \
 	fi
 
 $(TARGET_DIR)/var/update: | $(TARGET_DIR)
-	mkdir -p $@
+	mkdir -p $(@)
 ifeq ($(BOXTYPE), coolstream)
-	cp -a $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/uldr.bin $@
+	cp -a $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/uldr.bin $(@)
   ifeq ($(BOXMODEL), kronos_v2)
-	cp -a $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/u-boot.bin.kronos_v2 $@/u-boot.bin
+	cp -a $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/u-boot.bin.kronos_v2 $(@)/u-boot.bin
   else
-	cp -a $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/u-boot.bin $@
+	cp -a $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/u-boot.bin $(@)
   endif
 endif
 
diff --git a/make/clean.mk b/make/clean.mk
index f5d1496a..ac6de160 100644
--- a/make/clean.mk
+++ b/make/clean.mk
@@ -43,7 +43,7 @@ all-clean: rebuild-clean staging-clean host-clean static-base-clean
 	make cross-base-clean
 
 %-clean:
-	-find $(D) -name $(subst -clean,,$@) -delete
+	-find $(D) -name $(subst -clean,,$(@)) -delete
 
 clean: rebuild-clean bootstrap
 
diff --git a/make/crosstool.mk b/make/crosstool.mk
index 6f86764e..00138a9e 100644
--- a/make/crosstool.mk
+++ b/make/crosstool.mk
@@ -49,7 +49,7 @@ kernel-tarball: $(BUILD_TMP)/linux-$(KERNEL_VERSION).tar
 # create kernel-tarball
 $(BUILD_TMP)/linux-$(KERNEL_VERSION).tar: | $(BUILD_TMP)
 	make kernel.do_checkout
-	tar cf $@ --exclude-vcs -C $(SOURCE_DIR)/$(NI-LINUX-KERNEL) .
+	tar cf $(@) --exclude-vcs -C $(SOURCE_DIR)/$(NI-LINUX-KERNEL) .
 
 # -----------------------------------------------------------------------------
 
@@ -103,7 +103,7 @@ endif
 		$(INSTALL_DATA) $(CONFIGS)/ct-ng-$(BOXTYPE)-$(BOXSERIES).config .config; \
 		sed -i "s|^CT_PARALLEL_JOBS=.*|CT_PARALLEL_JOBS=$(PARALLEL_JOBS)|" .config; \
 		export NI_LOCAL_TARBALLS_DIR=$(ARCHIVE); \
-		export NI_PREFIX_DIR=$@; \
+		export NI_PREFIX_DIR=$(@); \
 		export NI_KERNEL_VERSION=$(KERNEL_VERSION); \
 		export NI_KERNEL_LOCATION=$(BUILD_TMP)/linux-$(KERNEL_VERSION).tar; \
 		export NI_LIBC_UCLIBC_CONFIG_FILE=$(CONFIGS)/ct-ng-uClibc-$(UCLIBC_VER).config; \
@@ -126,7 +126,7 @@ endif
 # bre2ze4k uses same crosstool as hd51; so let's just create a symlink
 $(CROSS_BASE)/arm/bre2ze4k:
 	make $(CROSS_BASE)/arm/hd51
-	ln -sf hd51 $@
+	ln -sf hd51 $(@)
 
 # -----------------------------------------------------------------------------
 
diff --git a/make/environment-build.mk b/make/environment-build.mk
index b998b09f..a6af48f2 100644
--- a/make/environment-build.mk
+++ b/make/environment-build.mk
@@ -305,7 +305,7 @@ CD    = set -e; cd
 CHDIR = $(CD) $(BUILD_TMP)
 MKDIR = mkdir -p $(BUILD_TMP)
 CPDIR = cp -a -t $(BUILD_TMP) $(ARCHIVE)
-TOUCH = @touch $@
+TOUCH = @touch $(@)
 
 INSTALL      = install
 INSTALL_DATA = $(INSTALL) -m 0644
diff --git a/make/environment-target.mk b/make/environment-target.mk
index 7dbf6b8c..aebdbd79 100644
--- a/make/environment-target.mk
+++ b/make/environment-target.mk
@@ -27,7 +27,7 @@ $(SHAREWEBTV) \
 $(VARCONFIG) \
 $(VARINITD) \
 $(VARPLUGINS) : | $(TARGET_DIR)
-	mkdir -p $@
+	mkdir -p $(@)
 
 # -----------------------------------------------------------------------------
 
diff --git a/make/helpers.mk b/make/helpers.mk
index 2d3c6ef8..8a120714 100644
--- a/make/helpers.mk
+++ b/make/helpers.mk
@@ -14,7 +14,7 @@ endef
 
 # apply patch sets
 define apply_patches
-	l=`echo $(2)`; test -z $$l && l=1; \
+	l=$(strip $(2)); test -z $$l && l=1; \
 	for i in $(1); do \
 		if [ -d $$i ]; then \
 			for p in $$i/*; do \
@@ -95,8 +95,8 @@ endef
 # -----------------------------------------------------------------------------
 
 archives-list:
-	@rm -f $(BUILD_TMP)/$@
-	@make -qp | grep --only-matching '^\$(ARCHIVE).*:' | sed "s|:||g" > $(BUILD_TMP)/$@
+	@rm -f $(BUILD_TMP)/$(@)
+	@make -qp | grep --only-matching '^\$(ARCHIVE).*:' | sed "s|:||g" > $(BUILD_TMP)/$(@)
 
 DOCLEANUP ?= no
 GETMISSING ?= no
diff --git a/make/host-tools.mk b/make/host-tools.mk
index a12d879b..0376d259 100644
--- a/make/host-tools.mk
+++ b/make/host-tools.mk
@@ -50,7 +50,7 @@ $(HOST_DIR)/bin/pkg-config: $(ARCHIVE)/$(HOST_PKG-CONFIG_SOURCE) | $(HOST_DIR)/b
 
 host-pkg-config-link: $(HOST_DIR)/bin/$(TARGET)-pkg-config
 $(HOST_DIR)/bin/$(TARGET)-pkg-config: | $(HOST_DIR)/bin
-	ln -sf pkg-config $@
+	ln -sf pkg-config $(@)
 
 # -----------------------------------------------------------------------------
 
diff --git a/make/image-updates.mk b/make/image-updates.mk
index 3ef223f7..1b4af969 100644
--- a/make/image-updates.mk
+++ b/make/image-updates.mk
@@ -115,7 +115,7 @@ pathauf-192:
 	$(INSTALL_EXEC) $(IMAGEFILES)/channellists/update-ctrl/preinstall.sh $(PREINSTALL_SH)
 	$(INSTALL_EXEC) $(IMAGEFILES)/channellists/update-ctrl/postinstall.sh $(POSTINSTALL_SH)
 	mkdir -pv $(UPDATE_INST_DIR)/var/tuxbox/config/zapit && \
-	cp -f $(IMAGEFILES)/channellists/$@/* $(UPDATE_INST_DIR)/var/tuxbox/config/zapit/
+	cp -f $(IMAGEFILES)/channellists/$(@)/* $(UPDATE_INST_DIR)/var/tuxbox/config/zapit/
 	# remove non-printable chars and re-format xml-files
 	$(CD) $(UPDATE_INST_DIR)/var/tuxbox/config/zapit/; \
 	for file in *.xml; do \
@@ -143,7 +143,7 @@ pathauf-192:
 	#; \
 	i=0; \
 	for dir in $${DIR[*]}; do \
-		if [ $$dir = $@ ]; \
+		if [ $$dir = $(@) ]; \
 		then \
 			desc=$${DESC[$$i]}; \
 			date=$${DATE[$$i]}; \
@@ -156,7 +156,7 @@ pathauf-192:
 			UPDATE_TYPE=S \
 			UPDATE_URL=$(CHANNELLISTS_URL) \
 			UPDATE_MD5FILE=$(CHANNELLISTS_MD5FILE) \
-			UPDATE_NAME=$@ \
+			UPDATE_NAME=$(@) \
 			UPDATE_DESC="$$desc - " \
 			UPDATE_VERSION="$$date" \
 
diff --git a/make/images.mk b/make/images.mk
index 26170f16..daea135a 100644
--- a/make/images.mk
+++ b/make/images.mk
@@ -24,25 +24,25 @@ devtable: $(BUILD_TMP)/devtable-$(BOXSERIES).txt
 
 $(BUILD_TMP)/devtable-hd1.txt:
 	#	<name>		<type>	<mode>	<uid>	<gid>	<major>	<minor>	<start>	<inc>	<count>
-	echo	"/dev/pts	d	755	0	0	-	-	-	-	-"	> $@
-	echo	"/dev/shm	d	755	0	0	-	-	-	-	-"	>> $@
-	echo	"/dev/shm/usb	d	755	0	0	-	-	-	-	-"	>> $@
-	echo	"/dev/null	c	666	0	0	1	3	0	0	-"	>> $@
-	echo	"/dev/console	c	666	0	0	5	1	-	-	-"	>> $@
-	echo	"/dev/ttyRI0	c	666	0	0	204	16	-	-	-"	>> $@
-	echo	"/dev/mtd	c	640	0	0	90	0	0	2	6"	>> $@
-	echo	"/dev/mtdblock	b	640	0	0	31	0	0	1	6"	>> $@
+	echo	"/dev/pts	d	755	0	0	-	-	-	-	-"	 > $(@)
+	echo	"/dev/shm	d	755	0	0	-	-	-	-	-"	>> $(@)
+	echo	"/dev/shm/usb	d	755	0	0	-	-	-	-	-"	>> $(@)
+	echo	"/dev/null	c	666	0	0	1	3	0	0	-"	>> $(@)
+	echo	"/dev/console	c	666	0	0	5	1	-	-	-"	>> $(@)
+	echo	"/dev/ttyRI0	c	666	0	0	204	16	-	-	-"	>> $(@)
+	echo	"/dev/mtd	c	640	0	0	90	0	0	2	6"	>> $(@)
+	echo	"/dev/mtdblock	b	640	0	0	31	0	0	1	6"	>> $(@)
 
 $(BUILD_TMP)/devtable-hd2.txt:
 	#	<name>		<type>	<mode>	<uid>	<gid>	<major>	<minor>	<start>	<inc>	<count>
-	echo	"/dev/pts	d	755	0	0	-	-	-	-	-"	> $@
-	echo	"/dev/shm	d	755	0	0	-	-	-	-	-"	>> $@
-	echo	"/dev/shm/usb	d	755	0	0	-	-	-	-	-"	>> $@
-	echo	"/dev/null	c	666	0	0	1	3	0	0	-"	>> $@
-	echo	"/dev/console	c	666	0	0	5	1	-	-	-"	>> $@
-	echo	"/dev/ttyS0	c	666	0	0	4	64	-	-	-"	>> $@
-	echo	"/dev/mtd	c	640	0	0	90	0	0	2	9"	>> $@
-	echo	"/dev/mtdblock	b	640	0	0	31	0	0	1	9"	>> $@
+	echo	"/dev/pts	d	755	0	0	-	-	-	-	-"	 > $(@)
+	echo	"/dev/shm	d	755	0	0	-	-	-	-	-"	>> $(@)
+	echo	"/dev/shm/usb	d	755	0	0	-	-	-	-	-"	>> $(@)
+	echo	"/dev/null	c	666	0	0	1	3	0	0	-"	>> $(@)
+	echo	"/dev/console	c	666	0	0	5	1	-	-	-"	>> $(@)
+	echo	"/dev/ttyS0	c	666	0	0	4	64	-	-	-"	>> $(@)
+	echo	"/dev/mtd	c	640	0	0	90	0	0	2	9"	>> $(@)
+	echo	"/dev/mtdblock	b	640	0	0	31	0	0	1	9"	>> $(@)
 
 devtable-remove:
 	$(REMOVE)/devtable-$(BOXSERIES).txt
diff --git a/make/linux-kernel.mk b/make/linux-kernel.mk
index 883e1d26..8b08995e 100644
--- a/make/linux-kernel.mk
+++ b/make/linux-kernel.mk
@@ -135,7 +135,7 @@ STRIP-MODULES-COOLSTREAM-HD1 += kernel/fs/fuse/fuse.ko
 
 $(D)/kernel-modules-coolstream-hd1: $(D)/kernel-coolstream
 	for module in $(STRIP-MODULES-COOLSTREAM-HD1); do \
-		mkdir -p $(TARGET_MODULES_DIR)/$$(dirname "$$module"); \
+		mkdir -p $(TARGET_MODULES_DIR)/$(dir "$$module"); \
 		$(TARGET_OBJCOPY) --strip-unneeded $(KERNEL_MODULES_DIR)/$$module $(TARGET_MODULES_DIR)/$$module; \
 	done;
 	rm -f $(TARGET_MODULES_DIR)/usb-storage.ko # already builtin
diff --git a/make/neutrino-plugins.mk b/make/neutrino-plugins.mk
index 32ec8b62..39ee73aa 100644
--- a/make/neutrino-plugins.mk
+++ b/make/neutrino-plugins.mk
@@ -102,7 +102,7 @@ neutrino-plugins-clean-all: neutrino-plugins-clean
 
 neutrino-plugin-%: $(NP_OBJ_DIR)/config.status
 	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
-	$(MAKE) -C $(NP_OBJ_DIR)/$(subst neutrino-plugin-,,$@) all install DESTDIR=$(TARGET_DIR)
+	$(MAKE) -C $(NP_OBJ_DIR)/$(subst neutrino-plugin-,,$(@)) all install DESTDIR=$(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
diff --git a/make/neutrino.mk b/make/neutrino.mk
index 934ae097..75f7abcc 100644
--- a/make/neutrino.mk
+++ b/make/neutrino.mk
@@ -174,7 +174,7 @@ $(D)/neutrino: $(N_OBJ_DIR)/config.status
 # -----------------------------------------------------------------------------
 
 $(TARGET_DIR)/etc/init.d/start_neutrino:
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/start_neutrino.$(BOXTYPE) $@
+	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/start_neutrino.$(BOXTYPE) $(@)
 
 # -----------------------------------------------------------------------------
 
diff --git a/make/ni.mk b/make/ni.mk
index e31fcbc3..113f5358 100644
--- a/make/ni.mk
+++ b/make/ni.mk
@@ -20,7 +20,7 @@ personalized-image:
 
 image \
 ni-image:
-	@echo "starting 'make $@' build with "$(PARALLEL_JOBS)" threads!"
+	@echo "starting 'make $(@)' build with "$(PARALLEL_JOBS)" threads!"
 	$(MAKE) kernel
 	$(MAKE) neutrino
 	make plugins
diff --git a/make/prerequisites.mk b/make/prerequisites.mk
index fa5258b7..c8758535 100644
--- a/make/prerequisites.mk
+++ b/make/prerequisites.mk
@@ -35,7 +35,7 @@ TOOLCHECK += find-tic
 TOOLCHECK += find-yacc
 
 find-%:
-	@TOOL=$(patsubst find-%,%,$@); \
+	@TOOL=$(patsubst find-%,%,$(@)); \
 	type -p $$TOOL >/dev/null || { echo "required tool $$TOOL missing."; false; }
 
 toolcheck: $(TOOLCHECK)
@@ -68,15 +68,15 @@ download:
 # -----------------------------------------------------------------------------
 
 $(SOURCE_DIR):
-	mkdir -p $@
+	mkdir -p $(@)
 
 $(BUILD-GENERIC-PC):
 	git clone $(NI-GIT)/$(NI-BUILD-GENERIC-PC).git $(BUILD-GENERIC-PC)
 
 $(SOURCE_DIR)/$(NI-NEUTRINO):
 	$(CD) $(SOURCE_DIR); \
-		git clone $(NI-GIT)/$(notdir $@).git
-	$(CD) $@; \
+		git clone $(NI-GIT)/$(@F).git
+	$(CD) $(@); \
 		git remote add tuxbox $(GITHUB)/tuxbox-neutrino/gui-neutrino.git; \
 		git remote add seife  $(GITHUB)/neutrino-mp/neutrino-mp.git; \
 		git remote add ddt    $(GITHUB)/duckbox-developers/neutrino-mp-ddt.git; \
@@ -86,8 +86,8 @@ $(SOURCE_DIR)/$(NI-NEUTRINO):
 
 $(SOURCE_DIR)/$(NI-LIBSTB-HAL):
 	$(CD) $(SOURCE_DIR); \
-		git clone $(NI-GIT)/$(notdir $@).git
-	$(CD) $@; \
+		git clone $(NI-GIT)/$(@F).git
+	$(CD) $(@); \
 		git remote add tuxbox $(GITHUB)/tuxbox-neutrino/library-stb-hal.git; \
 		git remote add seife  $(GITHUB)/neutrino-mp/libstb-hal.git; \
 		git remote add ddt    $(GITHUB)/duckbox-developers/libstb-hal-ddt.git; \
@@ -98,16 +98,16 @@ $(SOURCE_DIR)/$(NI-LIBSTB-HAL):
 $(SOURCE_DIR)/$(NI-LIBCOOLSTREAM):
 ifeq ($(HAS_LIBCS), yes)
 	$(CD) $(SOURCE_DIR); \
-		git clone $(NI-GIT)/$(notdir $@).git
-	$(CD) $@; \
+		git clone $(NI-GIT)/$(@F).git
+	$(CD) $(@); \
 		git checkout $(NI-LIBCOOLSTREAM_BRANCH)
 endif
 
 # upstream for rebase
 $(SOURCE_DIR)/$(NI-FFMPEG):
 	$(CD) $(SOURCE_DIR); \
-		git clone $(NI-GIT)/$(notdir $@).git
-	$(CD) $@; \
+		git clone $(NI-GIT)/$(@F).git
+	$(CD) $(@); \
 		git remote add upstream https://git.ffmpeg.org/ffmpeg.git; \
 		git fetch --all
 
@@ -115,8 +115,8 @@ $(SOURCE_DIR)/$(NI-FFMPEG):
 # torvalds for cherry-picking
 $(SOURCE_DIR)/$(NI-LINUX-KERNEL):
 	$(CD) $(SOURCE_DIR); \
-		git clone $(NI-GIT)/$(notdir $@).git
-	$(CD) $@; \
+		git clone $(NI-GIT)/$(@F).git
+	$(CD) $(@); \
 		git remote add upstream https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git; \
 		git remote add torvalds https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git; \
 		git fetch --all
@@ -124,16 +124,16 @@ $(SOURCE_DIR)/$(NI-LINUX-KERNEL):
 # upstream for rebase
 $(SOURCE_DIR)/$(NI-OFGWRITE):
 	$(CD) $(SOURCE_DIR); \
-		git clone $(NI-GIT)/$(notdir $@).git
-	$(CD) $@ && \
+		git clone $(NI-GIT)/$(@F).git
+	$(CD) $(@) && \
 		git remote add upstream $(GITHUB)/oe-alliance/ofgwrite.git; \
 		git fetch --all
 
 # upstream for rebase
 $(SOURCE_DIR)/$(NI-RTMPDUMP):
 	$(CD) $(SOURCE_DIR); \
-		git clone $(NI-GIT)/$(notdir $@).git
-	$(CD) $@ && \
+		git clone $(NI-GIT)/$(@F).git
+	$(CD) $(@) && \
 		git remote add upstream git://git.ffmpeg.org/rtmpdump; \
 		git fetch --all
 
@@ -143,7 +143,7 @@ $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS) \
 $(SOURCE_DIR)/$(NI-OPENTHREADS) \
 $(SOURCE_DIR)/$(NI-STREAMRIPPER):
 	$(CD) $(SOURCE_DIR); \
-		git clone $(NI-GIT)/$(notdir $@).git
+		git clone $(NI-GIT)/$(@F).git
 
 ni-sources: $(SOURCE_DIR) \
 	$(BUILD-GENERIC-PC) \
diff --git a/make/target-libs-static.mk b/make/target-libs-static.mk
index d01bd1ca..7ecf59d0 100644
--- a/make/target-libs-static.mk
+++ b/make/target-libs-static.mk
@@ -18,7 +18,7 @@ CORTEX-STRINGS_SOURCE = cortex-strings-$(CORTEX-STRINGS_VER).tar.bz2
 CORTEX-STRINGS_URL    = http://git.linaro.org/git-ro/toolchain/cortex-strings.git
 
 $(ARCHIVE)/$(CORTEX-STRINGS_SOURCE):
-	$(GET-GIT-ARCHIVE) $(CORTEX-STRINGS_URL) $(CORTEX-STRINGS_VER) $(notdir $@) $(ARCHIVE)
+	$(GET-GIT-ARCHIVE) $(CORTEX-STRINGS_URL) $(CORTEX-STRINGS_VER) $(@F) $(ARCHIVE)
 
 CORTEX-STRINGS_CONF   = $(if $(filter $(BOXSERIES), hd51 bre2ze4k), --with-neon, --without-neon)
 
diff --git a/make/target-libs.mk b/make/target-libs.mk
index dc9db8bf..73ad762b 100644
--- a/make/target-libs.mk
+++ b/make/target-libs.mk
@@ -972,7 +972,7 @@ $(D)/rtmpdump: $(RTMPDUMP_DEPS) $(SOURCE_DIR)/$(NI-RTMPDUMP) | $(TARGET_DIR)
 	$(REMOVE)/$(NI-RTMPDUMP)
 	tar -C $(SOURCE_DIR) -cp $(NI-RTMPDUMP) --exclude-vcs | tar -C $(BUILD_TMP) -x
 	$(CHDIR)/$(NI-RTMPDUMP); \
-		make $(RTMPDUMP_MAKE_OPTS) CROSS_COMPILE=$(TARGET_CROSS) XCFLAGS="$(TARGET_CFLAGS)" XLDFLAGS="$(TARGET_LDFLAGS)";\
+		make $(RTMPDUMP_MAKE_OPTS) CROSS_COMPILE=$(TARGET_CROSS) XCFLAGS="$(TARGET_CFLAGS)" XLDFLAGS="$(TARGET_LDFLAGS)"; \
 		make $(RTMPDUMP_MAKE_OPTS) install DESTDIR=$(TARGET_DIR)
 	rm -rf $(TARGET_DIR)/sbin/rtmpgw
 	rm -rf $(TARGET_DIR)/sbin/rtmpsrv
@@ -1002,7 +1002,7 @@ $(D)/libtirpc: $(ARCHIVE)/$(LIBTIRPC_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LIBTIRPC_TMP)
 	$(UNTAR)/$(LIBTIRPC_SOURCE)
 	$(CHDIR)/$(LIBTIRPC_TMP); \
-		$(call apply_patches, $(addprefix $(notdir $@)/,$(LIBTIRP_PATCH))); \
+		$(call apply_patches, $(addprefix $(@F)/,$(LIBTIRP_PATCH))); \
 		autoreconf -fi; \
 		$(CONFIGURE) \
 			--target=$(TARGET) \
diff --git a/make/target-lua.mk b/make/target-lua.mk
index 44367e9b..9f4f2c22 100644
--- a/make/target-lua.mk
+++ b/make/target-lua.mk
@@ -72,7 +72,7 @@ LUA-FEEDPARSER_SOURCE = lua-feedparser-$(LUA-FEEDPARSER_VER).tar.gz
 LUA-FEEDPARSER_URL    = https://github.com/slact/lua-feedparser/archive
 
 $(ARCHIVE)/$(LUA-FEEDPARSER_SOURCE):
-	$(DOWNLOAD) $(LUA-FEEDPARSER_URL)/$(LUA-FEEDPARSER_SOURCE) -O $@
+	$(DOWNLOAD) $(LUA-FEEDPARSER_URL)/$(LUA-FEEDPARSER_SOURCE) -O $(@)
 
 LUA-FEEDPARSER_PATCH  = lua-feedparser.patch
 
@@ -135,7 +135,7 @@ LUAPOSIX_SOURCE = luaposix-$(LUAPOSIX_VER).tar.gz
 LUAPOSIX_URL    = https://github.com/luaposix/luaposix/archive
 
 $(ARCHIVE)/$(LUAPOSIX_SOURCE):
-	$(DOWNLOAD) $(LUAPOSIX_URL)/v$(LUAPOSIX_VER).tar.gz -O $@
+	$(DOWNLOAD) $(LUAPOSIX_URL)/v$(LUAPOSIX_VER).tar.gz -O $(@)
 
 LUAPOSIX_PATCH  = luaposix-fix-build.patch
 LUAPOSIX_PATCH += luaposix-fix-docdir-build.patch
@@ -154,7 +154,7 @@ SLINGSHOT_SOURCE = slingshot-$(SLINGSHOT_VER).tar.gz
 SLINGSHOT_URL    = https://github.com/gvvaughan/slingshot/archive
 
 $(ARCHIVE)/$(SLINGSHOT_SOURCE):
-	$(DOWNLOAD) $(SLINGSHOT_URL)/v$(SLINGSHOT_VER).tar.gz -O $@
+	$(DOWNLOAD) $(SLINGSHOT_URL)/v$(SLINGSHOT_VER).tar.gz -O $(@)
 
 $(D)/luaposix: $(LUAPOSIX_DEPS) $(ARCHIVE)/$(SLINGSHOT_SOURCE) $(ARCHIVE)/$(GNULIB_SOURCE) $(ARCHIVE)/$(LUAPOSIX_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LUAPOSIX_TMP)
diff --git a/make/target-rootfs.mk b/make/target-rootfs.mk
index 56409d54..29b11036 100644
--- a/make/target-rootfs.mk
+++ b/make/target-rootfs.mk
@@ -13,25 +13,25 @@ endif
 
 .version: $(TARGET_DIR)/.version
 $(TARGET_DIR)/.version: | $(TARGET_DIR)
-	echo "distro=NI"							 > $@
-	echo "imagename=NI \o/ Neutrino-Image"					>> $@
-	echo "imageversion=$(IMAGE_VERSION)"					>> $@
-	echo "version=$(IMAGE_TYPE)$(IMAGE_VER)$(IMAGE_DATE)"	 		>> $@
-	echo "describe=$$(git describe --always --long --tags | sed 's/-/./2')"	>> $@
-	echo "builddate=$$(date)"						>> $@
-	echo "box_model=$(BOXMODEL)"						>> $@
-	echo "creator=$(MAINTAINER)"						>> $@
-	echo "homepage=www.neutrino-images.de"					>> $@
+	echo "distro=NI"							 > $(@)
+	echo "imagename=NI \o/ Neutrino-Image"					>> $(@)
+	echo "imageversion=$(IMAGE_VERSION)"					>> $(@)
+	echo "version=$(IMAGE_TYPE)$(IMAGE_VER)$(IMAGE_DATE)"	 		>> $(@)
+	echo "describe=$$(git describe --always --long --tags | sed 's/-/./2')"	>> $(@)
+	echo "builddate=$$(date)"						>> $(@)
+	echo "box_model=$(BOXMODEL)"						>> $(@)
+	echo "creator=$(MAINTAINER)"						>> $(@)
+	echo "homepage=www.neutrino-images.de"					>> $(@)
 ifeq ($(BOXTYPE), armbox)
-	echo "imagedir=$(BOXMODEL)"						>> $@
+	echo "imagedir=$(BOXMODEL)"						>> $(@)
 endif
 
 # -----------------------------------------------------------------------------
 
 update.urls: $(TARGET_DIR)/var/etc/update.urls
 $(TARGET_DIR)/var/etc/update.urls: | $(TARGET_DIR)
-	echo "$(NI-SERVER)/update.php"				 > $@
-	echo "$(CHANNELLISTS_URL)/$(CHANNELLISTS_MD5FILE)"	>> $@
+	echo "$(NI-SERVER)/update.php"				 > $(@)
+	echo "$(CHANNELLISTS_URL)/$(CHANNELLISTS_MD5FILE)"	>> $(@)
 
 # -----------------------------------------------------------------------------
 
@@ -86,12 +86,12 @@ e2-multiboot: | $(TARGET_DIR)
 # -----------------------------------------------------------------------------
 
 personalize: | $(TARGET_DIR)
-	$(call local-script,$(notdir $@),start)
+	$(call local-script,$(@F),start)
 	@LOCAL_ROOT=$(LOCAL_DIR)/root; \
 	if [ -n "$$(ls -A $$LOCAL_ROOT)" ]; then \
 		cp -a -v $$LOCAL_ROOT/* $(TARGET_DIR)/; \
 	fi
-	$(call local-script,$(notdir $@),stop)
+	$(call local-script,$(@F),stop)
 
 # -----------------------------------------------------------------------------
 
diff --git a/make/target-scripts.mk b/make/target-scripts.mk
index 6145e5dd..99db2c3c 100644
--- a/make/target-scripts.mk
+++ b/make/target-scripts.mk
@@ -22,72 +22,72 @@ init-scripts: \
 	$(TARGET_DIR)/etc/init.d/syslogd
 
 $(TARGET_DIR)/etc/init.d/globals:
-	$(INSTALL_DATA) -D $(IMAGEFILES)/scripts/init.globals $@
+	$(INSTALL_DATA) -D $(IMAGEFILES)/scripts/init.globals $(@)
 
 $(TARGET_DIR)/etc/init.d/functions:
-	$(INSTALL_DATA) -D $(IMAGEFILES)/scripts/init.functions $@
+	$(INSTALL_DATA) -D $(IMAGEFILES)/scripts/init.functions $(@)
 
 $(TARGET_DIR)/etc/init.d/camd:
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/camd.init $@
+	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/camd.init $(@)
 	ln -sf camd $(TARGET_DIR)/etc/init.d/S99camd
 	ln -sf camd $(TARGET_DIR)/etc/init.d/K01camd
 
 $(TARGET_DIR)/etc/init.d/camd_datefix:
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/camd_datefix.init $@
+	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/camd_datefix.init $(@)
 
 $(TARGET_DIR)/etc/init.d/coredump:
 ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd51 bre2ze4k))
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/coredump.init $@
+	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/coredump.init $(@)
 endif
 
 $(TARGET_DIR)/etc/init.d/crond:
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/crond.init $@
+	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/crond.init $(@)
 	ln -sf crond $(TARGET_DIR)/etc/init.d/S55crond
 	ln -sf crond $(TARGET_DIR)/etc/init.d/K55crond
 
 $(TARGET_DIR)/etc/init.d/custom-poweroff:
 ifeq ($(BOXTYPE), coolstream)
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/custom-poweroff.init $@
+	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/custom-poweroff.init $(@)
 endif
 
 $(TARGET_DIR)/etc/init.d/fstab:
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/fstab.init $@
+	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/fstab.init $(@)
 	ln -sf fstab $(TARGET_DIR)/etc/init.d/S01fstab
 	ln -sf fstab $(TARGET_DIR)/etc/init.d/K99fstab
 
 $(TARGET_DIR)/etc/init.d/hostname:
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/hostname.init $@
+	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/hostname.init $(@)
 
 $(TARGET_DIR)/etc/init.d/inetd:
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/inetd.init $@
+	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/inetd.init $(@)
 	ln -sf inetd $(TARGET_DIR)/etc/init.d/S53inetd
 	ln -sf inetd $(TARGET_DIR)/etc/init.d/K80inetd
 
 $(TARGET_DIR)/etc/init.d/networking:
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/networking.init $@
+	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/networking.init $(@)
 	ln -sf networking $(TARGET_DIR)/etc/init.d/K99networking
 
 $(TARGET_DIR)/etc/init.d/partitions-by-name:
 ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 bre2ze4k))
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/partitions-by-name.init $@
+	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/partitions-by-name.init $(@)
 endif
 
 $(TARGET_DIR)/etc/init.d/resizerootfs:
 ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 bre2ze4k))
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/resizerootfs.init $@
+	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/resizerootfs.init $(@)
 endif
 
 $(TARGET_DIR)/etc/init.d/swap:
 ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 bre2ze4k))
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/swap.init $@
+	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/swap.init $(@)
 	ln -sf swap $(TARGET_DIR)/etc/init.d/K99swap
 endif
 
 $(TARGET_DIR)/etc/init.d/sys_update.sh:
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/sys_update.sh $@
+	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/sys_update.sh $(@)
 
 $(TARGET_DIR)/etc/init.d/syslogd:
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/syslogd.init $@
+	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/syslogd.init $(@)
 	ln -sf syslogd $(TARGET_DIR)/etc/init.d/K98syslogd
 
 # -----------------------------------------------------------------------------
@@ -98,12 +98,12 @@ scripts: \
 	$(TARGET_SHARE_DIR)/udhcpc/default.script
 
 $(TARGET_DIR)/sbin/service:
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/service $@
+	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/service $(@)
 
 $(TARGET_DIR)/sbin/flash_eraseall:
 ifeq ($(BOXTYPE), coolstream)
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/flash_eraseall $@
+	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/flash_eraseall $(@)
 endif
 
 $(TARGET_SHARE_DIR)/udhcpc/default.script:
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/udhcpc-default.script $@
+	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/udhcpc-default.script $(@)