diff --git a/make/bootstrap.mk b/make/bootstrap.mk
index 4d46cbb0..be9b2012 100644
--- a/make/bootstrap.mk
+++ b/make/bootstrap.mk
@@ -1,14 +1,14 @@
 # makefile to setup and initialize the final buildsystem
 
 BOOTSTRAP  = targetprefix $(D) $(BUILD_TMP) $(CROSS_DIR) $(STAGING_DIR) $(IMAGE_DIR) $(UPDATE_DIR) $(HOST_DIR)/bin includes-and-libs modules host-preqs
-BOOTSTRAP += $(TARGETLIB)/libc.so.6
+BOOTSTRAP += $(TARGET_LIB_DIR)/libc.so.6
 
 ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd51))
   BOOTSTRAP += static blobs
 endif
 
-PLAT_INCS  = $(TARGETLIB)/firmware
-PLAT_LIBS  = $(TARGETLIB) $(STATIC_LIB_DIR)
+PLAT_INCS  = $(TARGET_LIB_DIR)/firmware
+PLAT_LIBS  = $(TARGET_LIB_DIR) $(STATIC_LIB_DIR)
 
 bootstrap: $(BOOTSTRAP)
 	@echo -e "$(TERM_YELLOW)Bootstrapped for $(shell echo $(BOXTYPE) | sed 's/.*/\u&/') $(BOXMODEL)$(TERM_NORMAL)"
@@ -51,28 +51,28 @@ $(HOST_DIR)/bin: $(HOST_DIR)
 $(STATIC_LIB_DIR):
 	mkdir -p $@
 
-$(TARGETLIB)/firmware: | $(TARGET_DIR)
+$(TARGET_LIB_DIR)/firmware: | $(TARGET_DIR)
 ifeq ($(BOXTYPE), coolstream)
 	mkdir -p $@
 	cp -a $(SOURCE_DIR)/$(NI_DRIVERS-BIN)/$(DRIVERS_DIR)/firmware/* $@/
 endif
 
-$(TARGETLIB): | $(TARGET_DIR)
+$(TARGET_LIB_DIR): | $(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: | $(TARGET_DIR)
+$(TARGET_LIB_DIR)/modules: | $(TARGET_DIR)
 	mkdir -p $@
 	cp -a $(SOURCE_DIR)/$(NI_DRIVERS-BIN)/$(DRIVERS_DIR)/drivers/$(KERNEL_VERSION_FULL) $@/
 
-$(TARGETLIB)/libc.so.6: | $(TARGET_DIR)
+$(TARGET_LIB_DIR)/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); \
+		cp -a $(CROSS_DIR)/$(TARGET)/sys-root/lib/*so* $(TARGET_LIB_DIR); \
 	else \
-		cp -a $(CROSS_DIR)/$(TARGET)/lib/*so* $(TARGETLIB); \
+		cp -a $(CROSS_DIR)/$(TARGET)/lib/*so* $(TARGET_LIB_DIR); \
 	fi
 
 $(TARGET_DIR)/var/update: | $(TARGET_DIR)
@@ -88,7 +88,7 @@ endif
 
 includes-and-libs: $(PLAT_INCS) $(PLAT_LIBS)
 
-modules: $(TARGETLIB)/modules
+modules: $(TARGET_LIB_DIR)/modules
 
 blobs: $(TARGET_DIR)/var/update
 
@@ -222,8 +222,8 @@ $(HOST_DIR)/bin/resize2fs: $(ARCHIVE)/e2fsprogs-$(E2FSPROGS_VER).tar.gz | $(HOST
 	$(REMOVE)/e2fsprogs-$(E2FSPROGS_VER)
 
 # hack to make sure they are always copied
-PHONY += $(TARGETLIB)
-PHONY += $(TARGETLIB)/firmware
-PHONY += $(TARGETLIB)/modules
+PHONY += $(TARGET_LIB_DIR)
+PHONY += $(TARGET_LIB_DIR)/firmware
+PHONY += $(TARGET_LIB_DIR)/modules
 PHONY += $(TARGET_DIR)/var/update
 PHONY += ccache includes-and-libs modules targetprefix bootstrap blobs
diff --git a/make/environment.mk b/make/environment.mk
index e23c162b..85bbd06a 100644
--- a/make/environment.mk
+++ b/make/environment.mk
@@ -154,7 +154,7 @@ IMAGEFILES    = $(BASE_DIR)/archive-imagefiles
 SOURCES       = $(BASE_DIR)/archive-sources
 SKEL_ROOT     = $(BASE_DIR)/skel-root/$(BOXTYPE)/$(BOXSERIES)
 STATIC_LIB_DIR = $(STATIC_DIR)/lib
-TARGETLIB     = $(TARGET_DIR)/lib
+TARGET_LIB_DIR = $(TARGET_DIR)/lib
 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
@@ -229,7 +229,7 @@ endif
 TARGET_CFLAGS   = -pipe $(TARGET_O_CFLAGS) $(TARGET_MARCH_CFLAGS) $(TARGET_EXTRA_CFLAGS) $(CXX11_ABI) -g -I$(TARGETINCLUDE)
 TARGET_CPPFLAGS = $(TARGET_CFLAGS)
 TARGET_CXXFLAGS = $(TARGET_CFLAGS)
-TARGET_LDFLAGS  = $(CORTEX-STRINGS) -Wl,-O1 -Wl,-rpath,$(TARGETLIB) -Wl,-rpath-link,$(TARGETLIB) -L$(TARGETLIB) $(TARGET_EXTRA_LDFLAGS)
+TARGET_LDFLAGS  = $(CORTEX-STRINGS) -Wl,-O1 -Wl,-rpath,$(TARGET_LIB_DIR) -Wl,-rpath-link,$(TARGET_LIB_DIR) -L$(TARGET_LIB_DIR) $(TARGET_EXTRA_LDFLAGS)
 
 VPATH = $(D)
 
@@ -250,13 +250,13 @@ endif
 PATH := $(HOST_DIR)/bin:$(CROSS_DIR)/bin:$(HELPERS_DIR):$(PATH)
 
 PKG_CONFIG = $(HOST_DIR)/bin/$(TARGET)-pkg-config
-PKG_CONFIG_LIBDIR = $(TARGETLIB)
+PKG_CONFIG_LIBDIR = $(TARGET_LIB_DIR)
 PKG_CONFIG_PATH = $(PKG_CONFIG_LIBDIR)/pkgconfig
 
 # helper-"functions":
-REWRITE_LIBTOOL        = sed -i "s,^libdir=.*,libdir='$(TARGETLIB)'," $(TARGETLIB)
-REWRITE_LIBTOOL_STATIC = sed -i "s,^libdir=.*,libdir='$(TARGETLIB)'," $(STATIC_LIB_DIR)
-REWRITE_LIBTOOLDEP     = sed -i -e "s,\(^dependency_libs='\| \|-L\|^dependency_libs='\)/lib,\ $(TARGETLIB),g" $(TARGETLIB)
+REWRITE_LIBTOOL        = sed -i "s,^libdir=.*,libdir='$(TARGET_LIB_DIR)'," $(TARGET_LIB_DIR)
+REWRITE_LIBTOOL_STATIC = sed -i "s,^libdir=.*,libdir='$(TARGET_LIB_DIR)'," $(STATIC_LIB_DIR)
+REWRITE_LIBTOOLDEP     = sed -i -e "s,\(^dependency_libs='\| \|-L\|^dependency_libs='\)/lib,\ $(TARGET_LIB_DIR),g" $(TARGET_LIB_DIR)
 REWRITE_PKGCONF        = sed -i "s,^prefix=.*,prefix='$(TARGET_DIR)',"
 
 # unpack tarballs, clean up
diff --git a/make/kernel-arm.mk b/make/kernel-arm.mk
index 4904485d..429870ef 100644
--- a/make/kernel-arm.mk
+++ b/make/kernel-arm.mk
@@ -5,7 +5,7 @@ ZIMAGE		= $(BUILD_TMP)/linux-$(KERNEL_VERSION)/arch/arm/boot/zImage
 ZIMAGE_DTB	= $(BUILD_TMP)/linux-$(KERNEL_VERSION)/arch/arm/boot/zImage_DTB
 MODULES_DIR	= $(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules/lib/modules/$(KERNEL_VERSION_FULL)
 
-TARGETMODULES	= $(TARGETLIB)/modules/$(KERNEL_VERSION_FULL)
+TARGETMODULES	= $(TARGET_LIB_DIR)/modules/$(KERNEL_VERSION_FULL)
 
 $(D)/kernel-arm: $(SOURCE_DIR)/$(NI_LINUX-KERNEL) | $(TARGET_DIR)
 	cd $(SOURCE_DIR)/$(NI_LINUX-KERNEL) && \
diff --git a/make/kernel-cst.mk b/make/kernel-cst.mk
index caf41674..64c65b42 100644
--- a/make/kernel-cst.mk
+++ b/make/kernel-cst.mk
@@ -5,7 +5,7 @@ IMAGE		= $(BUILD_TMP)/linux-$(KERNEL_VERSION)/arch/arm/boot/Image
 ZIMAGE		= $(BUILD_TMP)/linux-$(KERNEL_VERSION)/arch/arm/boot/zImage
 MODULES_DIR	= $(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules/lib/modules/$(KERNEL_VERSION_FULL)
 
-TARGETMODULES	= $(TARGETLIB)/modules/$(KERNEL_VERSION_FULL)
+TARGETMODULES	= $(TARGET_LIB_DIR)/modules/$(KERNEL_VERSION_FULL)
 
 ifneq ($(wildcard $(SKEL_ROOT)-$(BOXFAMILY)),)
   KERNEL_DESTDIR = $(SKEL_ROOT)-$(BOXFAMILY)/var/update
diff --git a/make/neutrino.mk b/make/neutrino.mk
index 07f3daca..6b6b0b90 100644
--- a/make/neutrino.mk
+++ b/make/neutrino.mk
@@ -44,11 +44,11 @@ else
 	N_CFLAGS += $(TARGET_CFLAGS)
 endif
 
-N_LDFLAGS = -lcrypto -ldl -lz $(CORTEX-STRINGS) -L$(TARGETLIB)
+N_LDFLAGS = -lcrypto -ldl -lz $(CORTEX-STRINGS) -L$(TARGET_LIB_DIR)
 ifeq ($(DEBUG), yes)
-	N_LDFLAGS += -Wl,-rpath-link,$(TARGETLIB)
+	N_LDFLAGS += -Wl,-rpath-link,$(TARGET_LIB_DIR)
 else
-	N_LDFLAGS += -Wl,-O1 -Wl,-rpath-link,$(TARGETLIB) $(TARGET_EXTRA_LDFLAGS)
+	N_LDFLAGS += -Wl,-O1 -Wl,-rpath-link,$(TARGET_LIB_DIR) $(TARGET_EXTRA_LDFLAGS)
 endif
 
 N_CONFIGURE_DEBUG =
@@ -56,7 +56,7 @@ ifeq ($(HAS_LIBCS), yes)
   ifeq ($(DEBUG), yes)
 	N_CONFIGURE_DEBUG += \
 		--enable-libcoolstream-static \
-		--with-libcoolstream-static-dir=$(TARGETLIB)
+		--with-libcoolstream-static-dir=$(TARGET_LIB_DIR)
   endif
 endif
 
diff --git a/make/plugins-extra.mk b/make/plugins-extra.mk
index 2af502f3..5eb39e6d 100644
--- a/make/plugins-extra.mk
+++ b/make/plugins-extra.mk
@@ -14,7 +14,7 @@ $(LIBPLUG)/links.so: $(D)/zlib $(D)/openssl $(D)/libpng $(D)/libjpeg $(D)/giflib
 		export STRIP=$(TARGET)-strip && \
 		export SYSROOT=$(TARGET_DIR) && \
 		export PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) && \
-		export LD_LIBRARY_PATH=$(TARGETLIB) && \
+		export LD_LIBRARY_PATH=$(TARGET_LIB_DIR) && \
 		export CFLAGS="$(TARGET_CFLAGS)" && \
 		export LIBS="$(TARGET_LDFLAGS) $(CORTEX-STRINGS)" && \
 		./configure \
diff --git a/make/static.mk b/make/static.mk
index 9e0aada5..06b4a4d5 100644
--- a/make/static.mk
+++ b/make/static.mk
@@ -15,7 +15,7 @@ $(STATIC_LIB_DIR)/libcortex-strings.la: $(ARCHIVE)/cortex-strings-$(CORTEX-STRIN
 		CFLAGS="-pipe -O2 $(CXX11_ABI) -g -I$(TARGETINCLUDE)" \
 		CPPFLAGS="-pipe -O2 $(CXX11_ABI) -g -I$(TARGETINCLUDE)" \
 		CXXFLAGS="-pipe -O2 $(CXX11_ABI) -g -I$(TARGETINCLUDE)" \
-		LDFLAGS="-Wl,-O1 -L$(TARGETLIB)" \
+		LDFLAGS="-Wl,-O1 -L$(TARGET_LIB_DIR)" \
 		PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
 		./configure $(CONFIGURE_OPTS) \
 			--prefix= \
diff --git a/make/system-libs.mk b/make/system-libs.mk
index b5aa6601..4ebfc3da 100644
--- a/make/system-libs.mk
+++ b/make/system-libs.mk
@@ -201,7 +201,7 @@ $(D)/libjpeg: $(ARCHIVE)/libjpeg-turbo-$(LIBJPEG-TURBO_VER).tar.gz | $(TARGET_DI
 		$(MAKE)  && \
 		make install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_LIBTOOL)/libjpeg.la
-	rm -f $(TARGETLIB)/libturbojpeg* $(TARGETINCLUDE)/turbojpeg.h
+	rm -f $(TARGET_LIB_DIR)/libturbojpeg* $(TARGETINCLUDE)/turbojpeg.h
 	$(REMOVE)/libjpeg-turbo-$(LIBJPEG-TURBO_VER)
 	touch $@
 
@@ -237,12 +237,12 @@ $(D)/openssl: $(ARCHIVE)/openssl-$(OPENSSL_VER).tar.gz | $(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 $(TARGET_DIR)/bin/c_rehash $(TARGETLIB)/engines
+	rm -rf $(TARGET_DIR)/bin/c_rehash $(TARGET_LIB_DIR)/engines
 ifneq ($(BOXSERIES), hd51)
 	rm -rf $(TARGET_DIR)/bin/openssl
 endif
 	$(REMOVE)/openssl-$(OPENSSL_VER)
-	chmod 0755 $(TARGETLIB)/libcrypto.so.* $(TARGETLIB)/libssl.so.*
+	chmod 0755 $(TARGET_LIB_DIR)/libcrypto.so.* $(TARGET_LIB_DIR)/libssl.so.*
 	touch $@
 
 FFMPEG_DEPS = $(D)/openssl $(D)/librtmp $(D)/libbluray $(D)/libass
@@ -451,7 +451,7 @@ $(D)/libncurses: $(ARCHIVE)/ncurses-$(LIBNCURSES_VER).tar.gz | $(TARGET_DIR)
 		$(MAKE) libs && \
 		$(MAKE) install.libs DESTDIR=$(TARGET_DIR)
 	rm -rf $(HOST_DIR)/bin/ncurses*
-	rm -rf $(TARGETLIB)/libform* $(TARGETLIB)/libmenu* $(TARGETLIB)/libpanel*
+	rm -rf $(TARGET_LIB_DIR)/libform* $(TARGET_LIB_DIR)/libmenu* $(TARGET_LIB_DIR)/libpanel*
 	rm -rf $(PKG_CONFIG_PATH)/form.pc $(PKG_CONFIG_PATH)/menu.pc $(PKG_CONFIG_PATH)/panel.pc
 	mv $(TARGET_DIR)/bin/ncurses6-config $(HOST_DIR)/bin
 	$(REWRITE_PKGCONF) $(HOST_DIR)/bin/ncurses6-config
@@ -550,7 +550,7 @@ $(D)/libdpf: $(D)/libusb_compat $(ARCHIVE)/dpf-ax_svn$(DPF-AX_REV).tar.gz | $(TA
 		cp dpf.h $(TARGETINCLUDE)/libdpf/libdpf.h; \
 		cp ../include/spiflash.h $(TARGETINCLUDE)/libdpf/; \
 		cp ../include/usbuser.h $(TARGETINCLUDE)/libdpf/; \
-		cp libdpf.a $(TARGETLIB)/
+		cp libdpf.a $(TARGET_LIB_DIR)/
 	$(REMOVE)/dpf-ax_svn$(DPF-AX_REV)
 	touch $@
 
@@ -608,7 +608,7 @@ $(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=$(TARGET_DIR)/share/lua/$(LUA_ABIVER) LUA_CDIR=$(TARGETLIB)/lua/$(LUA_ABIVER)
+		$(MAKE) install LUA_LDIR=$(TARGET_DIR)/share/lua/$(LUA_ABIVER) LUA_CDIR=$(TARGET_LIB_DIR)/lua/$(LUA_ABIVER)
 	rm -rf $(TARGET_DIR)/share/lua/$(LUA_ABIVER)/lxp/tests
 	$(REMOVE)/luaexpat-$(LUA_EXPAT_VER)
 	touch $@
@@ -621,7 +621,7 @@ $(D)/luacurl: $(D)/libcurl $(D)/lua $(ARCHIVE)/Lua-cURL$(LUACURL_VER).tar.xz | $
 			CC=$(TARGET)-gcc \
 			LUA_CMOD=/lib/lua/$(LUA_ABIVER) \
 			LUA_LMOD=/share/lua/$(LUA_ABIVER) \
-			LIBDIR=$(TARGETLIB) \
+			LIBDIR=$(TARGET_LIB_DIR) \
 			LUA_INC=$(TARGETINCLUDE) \
 			CURL_LIBS="$(TARGET_LDFLAGS) -lcurl" \
 			$(MAKE); \
@@ -645,7 +645,7 @@ $(D)/luaposix: $(HOST_DIR)/bin/lua-$(LUA_VER) $(D)/lua $(D)/luaexpat $(ARCHIVE)/
 		$(CONFIGURE) \
 			--prefix= \
 			--exec-prefix= \
-			--libdir=$(TARGETLIB)/lua/$(LUA_ABIVER) \
+			--libdir=$(TARGET_LIB_DIR)/lua/$(LUA_ABIVER) \
 			--datarootdir=$(TARGET_DIR)/share/lua/$(LUA_ABIVER) \
 			--mandir=$(TARGET_DIR)/.remove \
 			--docdir=$(TARGET_DIR)/.remove \
@@ -678,8 +678,8 @@ $(D)/lua: $(D)/libncurses $(ARCHIVE)/lua-$(LUA_VER).tar.gz | $(TARGET_DIR)
 		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=$(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 0755 -D $(BUILD_TMP)/lua-$(LUA_VER)/src/liblua.so.$(LUA_VER) $(TARGET_LIB_DIR)/liblua.so.$(LUA_VER)
+	cd $(TARGET_LIB_DIR); ln -sf liblua.so.$(LUA_VER) $(TARGET_LIB_DIR)/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 $(TARGET_DIR)/bin/luac
@@ -847,8 +847,8 @@ $(D)/libxml2: $(ARCHIVE)/libxml2-$(LIBXML2_VER).tar.gz | $(TARGET_DIR)
 	$(REWRITE_LIBTOOL)/libxml2.la
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libxml-2.0.pc
 	$(REWRITE_PKGCONF) $(HOST_DIR)/bin/xml2-config
-	rm -rf $(TARGETLIB)/xml2Conf.sh
-	rm -rf $(TARGETLIB)/cmake
+	rm -rf $(TARGET_LIB_DIR)/xml2Conf.sh
+	rm -rf $(TARGET_LIB_DIR)/cmake
 	$(REMOVE)/libxml2-$(LIBXML2_VER)
 	touch $@
 
diff --git a/make/system-tools-extra.mk b/make/system-tools-extra.mk
index e6b7b4e2..66123a21 100644
--- a/make/system-tools-extra.mk
+++ b/make/system-tools-extra.mk
@@ -158,8 +158,8 @@ $(D)/python: $(ARCHIVE)/Python-$(PYTHON_VER).tgz | $(TARGET_DIR)
 			CROSS_COMPILE_TARGET=yes \
 			prefix=$(BUILD_TMP)/Python-$(PYTHON_VER)/_install \
 		; \
-		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*
+		cp -a $(BUILD_TMP)/Python-$(PYTHON_VER)/_install/lib/python* $(TARGET_LIB_DIR)/
+		cp -a $(BUILD_TMP)/Python-$(PYTHON_VER)/_install/lib/libpython* $(TARGET_LIB_DIR)/
+		chmod +w $(TARGET_LIB_DIR)/libpython*
 		install -m755 $(BUILD_TMP)/Python-$(PYTHON_VER)/_install/bin/python $(TARGET_DIR)/bin/
 	$(REMOVE)/Python-$(PYTHON_VER)
diff --git a/make/system-tools.mk b/make/system-tools.mk
index 5518054b..749738f8 100644
--- a/make/system-tools.mk
+++ b/make/system-tools.mk
@@ -38,7 +38,7 @@ $(D)/openssh: $(D)/openssl $(D)/zlib $(ARCHIVE)/openssh-$(OPENSSH_VER).tar.gz |
 		--with-pid-dir=/tmp \
 		--with-privsep-path=/var/empty \
 		--with-cppflags="-pipe $(TARGET_O_CFLAGS) $(TARGET_MARCH_CFLAGS) -g -I$(TARGETINCLUDE)" \
-		--with-ldflags="-L$(TARGETLIB)" \
+		--with-ldflags="-L$(TARGET_LIB_DIR)" \
 		--libexecdir=/bin \
 		--disable-strip \
 		--disable-lastlog \
@@ -278,7 +278,7 @@ $(D)/inadyn: $(D)/openssl $(D)/confuse $(D)/libite $(ARCHIVE)/inadyn-$(INADYN_VE
 		autoreconf -fi && \
 		$(CONFIGURE) \
 			--prefix= \
-			--libdir=$(TARGETLIB) \
+			--libdir=$(TARGET_LIB_DIR) \
 			--includedir=$(TARGETINCLUDE) \
 			--mandir=/.remove \
 			--docdir=/.remove \
@@ -324,7 +324,7 @@ $(D)/procps-ng: $(D)/libncurses $(ARCHIVE)/procps-ng-$(PROCPS-NG_VER).tar.xz | $
 		rm -f $(TARGET_DIR)/bin/ps $(TARGET_DIR)/bin/top && \
 		install -D -m 755 top/.libs/top $(TARGET_DIR)/bin/top && \
 		install -D -m 755 ps/.libs/pscommand $(TARGET_DIR)/bin/ps && \
-		cp -a proc/.libs/libprocps.so* $(TARGETLIB)
+		cp -a proc/.libs/libprocps.so* $(TARGET_LIB_DIR)
 	$(REMOVE)/procps-ng-$(PROCPS-NG_VER)
 	touch $@
 
@@ -646,9 +646,9 @@ $(D)/sg3-utils: $(ARCHIVE)/sg3_utils-$(SG3-UTILS_VER).tar.xz | $(TARGET_DIR)
 			--mandir=/.remove && \
 		$(MAKE) && \
 		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)
+		cp -a lib/.libs/libsgutils2.so.2.0.0 $(TARGET_LIB_DIR) && \
+		cp -a lib/.libs/libsgutils2.so.2 $(TARGET_LIB_DIR) && \
+		cp -a lib/.libs/libsgutils2.so $(TARGET_LIB_DIR)
 	$(REMOVE)/sg3_utils-$(SG3-UTILS_VER)
 	touch $@
 
@@ -668,14 +668,14 @@ $(D)/lcd4linux: $(D)/libncurses $(D)/libgd2 $(D)/libdpf | $(TARGET_DIR)
 	cd $(BUILD_TMP)/lcd4linux && \
 		./bootstrap && \
 		$(CONFIGURE) \
-			--libdir=$(TARGETLIB) \
+			--libdir=$(TARGET_LIB_DIR) \
 			--includedir=$(TARGETINCLUDE) \
 			--bindir=$(TARGET_DIR)/bin \
 			--prefix= \
 			--mandir=/.remove \
 			--docdir=/.remove \
 			--infodir=/.remove \
-			--with-ncurses=$(TARGETLIB) \
+			--with-ncurses=$(TARGET_LIB_DIR) \
 			--with-drivers='DPF, SamsungSPF' \
 			--with-plugins='all,!dbus,!mpris_dbus,!asterisk,!isdn,!pop3,!ppp,!seti,!huawei,!imon,!kvv,!sample,!w1retap,!wireless,!xmms,!gps,!mpd,!mysql,!qnaplog,!iconv' && \
 		$(MAKE) vcs_version && \