From 52111cf4b760d253f76300a8508c32b9044818a6 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Mon, 25 Dec 2017 23:14:22 +0100
Subject: [PATCH] - rename TARGETINCLUDE => TARGET_INCLUDE_DIR

---
 make/bootstrap.mk     |  2 +-
 make/environment.mk   |  4 ++--
 make/neutrino.mk      |  2 +-
 make/plugins-extra.mk |  4 ++--
 make/plugins.mk       | 24 ++++++++++++------------
 make/static.mk        |  6 +++---
 make/system-libs.mk   | 32 ++++++++++++++++----------------
 make/system-tools.mk  |  8 ++++----
 8 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/make/bootstrap.mk b/make/bootstrap.mk
index be9b2012..636cf18e 100644
--- a/make/bootstrap.mk
+++ b/make/bootstrap.mk
@@ -25,7 +25,7 @@ skeleton: | $(TARGET_DIR)
 targetprefix:
 	mkdir -p $(TARGET_DIR)
 	mkdir -p $(TARGET_DIR)/bin
-	mkdir -p $(TARGETINCLUDE)
+	mkdir -p $(TARGET_INCLUDE_DIR)
 	mkdir -p $(PKG_CONFIG_PATH)
 	make skeleton
 
diff --git a/make/environment.mk b/make/environment.mk
index 85bbd06a..c719b173 100644
--- a/make/environment.mk
+++ b/make/environment.mk
@@ -155,7 +155,7 @@ SOURCES       = $(BASE_DIR)/archive-sources
 SKEL_ROOT     = $(BASE_DIR)/skel-root/$(BOXTYPE)/$(BOXSERIES)
 STATIC_LIB_DIR = $(STATIC_DIR)/lib
 TARGET_LIB_DIR = $(TARGET_DIR)/lib
-TARGETINCLUDE = $(TARGET_DIR)/include
+TARGET_INCLUDE_DIR = $(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)
@@ -226,7 +226,7 @@ ifeq ($(BOXSERIES), hd51)
   CXX11_ABI              =
 endif
 
-TARGET_CFLAGS   = -pipe $(TARGET_O_CFLAGS) $(TARGET_MARCH_CFLAGS) $(TARGET_EXTRA_CFLAGS) $(CXX11_ABI) -g -I$(TARGETINCLUDE)
+TARGET_CFLAGS   = -pipe $(TARGET_O_CFLAGS) $(TARGET_MARCH_CFLAGS) $(TARGET_EXTRA_CFLAGS) $(CXX11_ABI) -g -I$(TARGET_INCLUDE_DIR)
 TARGET_CPPFLAGS = $(TARGET_CFLAGS)
 TARGET_CXXFLAGS = $(TARGET_CFLAGS)
 TARGET_LDFLAGS  = $(CORTEX-STRINGS) -Wl,-O1 -Wl,-rpath,$(TARGET_LIB_DIR) -Wl,-rpath-link,$(TARGET_LIB_DIR) -L$(TARGET_LIB_DIR) $(TARGET_EXTRA_LDFLAGS)
diff --git a/make/neutrino.mk b/make/neutrino.mk
index 6b6b0b90..2baf8914 100644
--- a/make/neutrino.mk
+++ b/make/neutrino.mk
@@ -39,7 +39,7 @@ ifeq ($(BOXSERIES), hd51)
 endif
 
 ifeq ($(DEBUG), yes)
-	N_CFLAGS += -ggdb3 -rdynamic -I$(TARGETINCLUDE)
+	N_CFLAGS += -ggdb3 -rdynamic -I$(TARGET_INCLUDE_DIR)
 else
 	N_CFLAGS += $(TARGET_CFLAGS)
 endif
diff --git a/make/plugins-extra.mk b/make/plugins-extra.mk
index 5eb39e6d..b83724c1 100644
--- a/make/plugins-extra.mk
+++ b/make/plugins-extra.mk
@@ -69,12 +69,12 @@ $(BIN)/logoview: $(BIN)
 blockads: $(SOURCE_DIR)/$(TUXBOX_PLUGINS) $(BIN)/blockad $(LIBPLUG)/blockads.so
 $(BIN)/blockad: $(D)/freetype $(BIN) $(VARCONF)
 	pushd $(SOURCE_DIR)/$(TUXBOX_PLUGINS)/blockads && \
-	$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -I$(TARGETINCLUDE)/freetype2 -lfreetype -lz $(CORTEX-STRINGS) -o $@ blockad.c globals.c http.c && \
+	$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -I$(TARGET_INCLUDE_DIR)/freetype2 -lfreetype -lz $(CORTEX-STRINGS) -o $@ blockad.c globals.c http.c && \
 	install -m644 blockads.conf $(VARCONF)/
 
 $(LIBPLUG)/blockads.so: $(LIBPLUG)
 	pushd $(SOURCE_DIR)/$(TUXBOX_PLUGINS)/blockads && \
-	$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -I$(TARGETINCLUDE)/freetype2 -lfreetype -lz $(CORTEX-STRINGS) -o $@ blockads.c gfx.c io.c text.c globals.c http.c && \
+	$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -I$(TARGET_INCLUDE_DIR)/freetype2 -lfreetype -lz $(CORTEX-STRINGS) -o $@ blockads.c gfx.c io.c text.c globals.c http.c && \
 	install -m644 blockads.cfg $(LIBPLUG)/
 
 stbup: $(BIN)/stbup
diff --git a/make/plugins.mk b/make/plugins.mk
index 9d8694fa..805ed322 100644
--- a/make/plugins.mk
+++ b/make/plugins.mk
@@ -141,7 +141,7 @@ $(LIBPLUG)/FritzInfoMonitor.so: $(D)/freetype $(D)/openssl $(D)/libcurl $(LIBPLU
 	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/FritzInfoMonitor && \
 	$(TARGET)-gcc -Wall $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
 		-I$(N_OBJDIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
-		-I$(TARGETINCLUDE)/freetype2 \
+		-I$(TARGET_INCLUDE_DIR)/freetype2 \
 		\
 		-lfreetype -lz -lstdc++ -lcrypto -lcurl \
 		\
@@ -263,7 +263,7 @@ $(BIN)/input: $(D)/freetype $(BIN)
 	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/input && \
 	$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
 		-I$(N_OBJDIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
-		-I$(TARGETINCLUDE)/freetype2 \
+		-I$(TARGET_INCLUDE_DIR)/freetype2 \
 		\
 		-lfreetype -lz -lpng \
 		\
@@ -296,7 +296,7 @@ $(LIBPLUG)/logoset.so: $(D)/freetype $(LIBPLUG)
 	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/logomask && \
 	$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
 		-I$(N_OBJDIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
-		-I$(TARGETINCLUDE)/freetype2 \
+		-I$(TARGET_INCLUDE_DIR)/freetype2 \
 		\
 		-lfreetype -lz \
 		\
@@ -326,7 +326,7 @@ $(BIN)/msgbox: $(D)/freetype $(BIN)
 	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/msgbox && \
 	$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
 		-I$(N_OBJDIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
-		-I$(TARGETINCLUDE)/freetype2 \
+		-I$(TARGET_INCLUDE_DIR)/freetype2 \
 		\
 		-lfreetype -lz -lpng \
 		\
@@ -348,7 +348,7 @@ $(BIN)/tuxcald: $(D)/freetype $(BIN) $(ETCINIT) $(VARCONF)
 	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/tuxcal/daemon && \
 	$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
 		-I$(N_OBJDIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
-		-I$(TARGETINCLUDE)/freetype2 \
+		-I$(TARGET_INCLUDE_DIR)/freetype2 \
 		\
 		-lfreetype -lz -lpthread \
 		\
@@ -367,7 +367,7 @@ $(LIBPLUG)/tuxcal.so: $(LIBPLUG)
 	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/tuxcal && \
 	$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
 		-I$(N_OBJDIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
-		-I$(TARGETINCLUDE)/freetype2 \
+		-I$(TARGET_INCLUDE_DIR)/freetype2 \
 		\
 		-lfreetype -lz \
 		\
@@ -383,7 +383,7 @@ $(LIBPLUG)/tuxcom.so: $(D)/freetype $(LIBPLUG)
 	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/tuxcom && \
 	$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
 		-I$(N_OBJDIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
-		-I$(TARGETINCLUDE)/freetype2 \
+		-I$(TARGET_INCLUDE_DIR)/freetype2 \
 		\
 		-lfreetype -lz \
 		\
@@ -399,7 +399,7 @@ $(BIN)/tuxmaild: $(D)/freetype $(D)/openssl $(BIN) $(ETCINIT) $(VARCONF)
 	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/tuxmail/daemon && \
 	$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
 		-I$(N_OBJDIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
-		-I$(TARGETINCLUDE)/freetype2 \
+		-I$(TARGET_INCLUDE_DIR)/freetype2 \
 		\
 		-lfreetype -lz -lcrypto -lssl -lpthread \
 		\
@@ -420,7 +420,7 @@ $(LIBPLUG)/tuxmail.so: $(LIBPLUG)
 	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/tuxmail && \
 	$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
 		-I$(N_OBJDIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
-		-I$(TARGETINCLUDE)/freetype2 \
+		-I$(TARGET_INCLUDE_DIR)/freetype2 \
 		\
 		-lfreetype -lz \
 		\
@@ -436,7 +436,7 @@ $(LIBPLUG)/tuxwetter.so: $(D)/freetype $(D)/libcurl $(D)/giflib $(D)/libjpeg $(L
 	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/tuxwetter && \
 	$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
 		-I$(N_OBJDIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
-		-I$(TARGETINCLUDE)/freetype2 \
+		-I$(TARGET_INCLUDE_DIR)/freetype2 \
 		\
 		-lfreetype -lz -lcrypto -lssl -lcurl -ljpeg -lpng -lgif \
 		\
@@ -488,7 +488,7 @@ $(LIBPLUG)/oscammon.so: $(LIBPLUG) $(VARCONF)
 	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/oscammon && \
 	$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
 		-I$(N_OBJDIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
-		-I$(TARGETINCLUDE)/freetype2 \
+		-I$(TARGET_INCLUDE_DIR)/freetype2 \
 		\
 		-lfreetype -lz -lcrypto \
 		\
@@ -516,7 +516,7 @@ $(LIBPLUG)/shellexec.so: $(D)/freetype $(LIBPLUG) $(SHAREFLEX) $(VARCONF) $(BIN)
 	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/shellexec; \
 	$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
 		-I$(N_OBJDIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
-		-I$(TARGETINCLUDE)/freetype2 \
+		-I$(TARGET_INCLUDE_DIR)/freetype2 \
 		\
 		-lfreetype -lz -lpng \
 		\
diff --git a/make/static.mk b/make/static.mk
index 06b4a4d5..5b06ecfa 100644
--- a/make/static.mk
+++ b/make/static.mk
@@ -12,9 +12,9 @@ $(STATIC_LIB_DIR)/libcortex-strings.la: $(ARCHIVE)/cortex-strings-$(CORTEX-STRIN
 	$(UNTAR)/cortex-strings-$(CORTEX-STRINGS_VER).tar.bz2
 	pushd $(BUILD_TMP)/cortex-strings-$(CORTEX-STRINGS_VER) && \
 		./autogen.sh && \
-		CFLAGS="-pipe -O2 $(CXX11_ABI) -g -I$(TARGETINCLUDE)" \
-		CPPFLAGS="-pipe -O2 $(CXX11_ABI) -g -I$(TARGETINCLUDE)" \
-		CXXFLAGS="-pipe -O2 $(CXX11_ABI) -g -I$(TARGETINCLUDE)" \
+		CFLAGS="-pipe -O2 $(CXX11_ABI) -g -I$(TARGET_INCLUDE_DIR)" \
+		CPPFLAGS="-pipe -O2 $(CXX11_ABI) -g -I$(TARGET_INCLUDE_DIR)" \
+		CXXFLAGS="-pipe -O2 $(CXX11_ABI) -g -I$(TARGET_INCLUDE_DIR)" \
 		LDFLAGS="-Wl,-O1 -L$(TARGET_LIB_DIR)" \
 		PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
 		./configure $(CONFIGURE_OPTS) \
diff --git a/make/system-libs.mk b/make/system-libs.mk
index 4ebfc3da..0df24a95 100644
--- a/make/system-libs.mk
+++ b/make/system-libs.mk
@@ -181,7 +181,7 @@ $(D)/freetype: $(D)/zlib $(D)/libpng $(ARCHIVE)/freetype-$(FREETYPE_VER).tar.bz2
 			--disable-static && \
 		$(MAKE) all && \
 		make install && \
-		ln -sf ./freetype2/freetype $(TARGETINCLUDE)/freetype && \
+		ln -sf ./freetype2/freetype $(TARGET_INCLUDE_DIR)/freetype && \
 	mv $(TARGET_DIR)/bin/freetype-config $(HOST_DIR)/bin/freetype-config
 	$(REMOVE)/freetype-$(FREETYPE_VER) $(TARGET_DIR)/share/aclocal
 	touch $@
@@ -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 $(TARGET_LIB_DIR)/libturbojpeg* $(TARGETINCLUDE)/turbojpeg.h
+	rm -f $(TARGET_LIB_DIR)/libturbojpeg* $(TARGET_INCLUDE_DIR)/turbojpeg.h
 	$(REMOVE)/libjpeg-turbo-$(LIBJPEG-TURBO_VER)
 	touch $@
 
@@ -383,7 +383,7 @@ ifeq ($(BOXSERIES), hd2)
 			--enable-decoder=vc1 \
 			--enable-hardcoded-tables \
 			--cpu=cortex-a9 \
-			--extra-cflags="-Wno-deprecated-declarations -I$(TARGETINCLUDE) -mfpu=vfpv3-d16 -mfloat-abi=hard"
+			--extra-cflags="-Wno-deprecated-declarations -I$(TARGET_INCLUDE_DIR) -mfpu=vfpv3-d16 -mfloat-abi=hard"
 endif
 
 ifeq ($(BOXSERIES), hd1)
@@ -393,7 +393,7 @@ ifeq ($(BOXSERIES), hd1)
 			--disable-neon \
 			--enable-small \
 			--cpu=armv6 \
-			--extra-cflags="-Wno-deprecated-declarations -I$(TARGETINCLUDE)"
+			--extra-cflags="-Wno-deprecated-declarations -I$(TARGET_INCLUDE_DIR)"
 endif
 
 ifeq ($(BOXSERIES), hd51)
@@ -404,7 +404,7 @@ ifeq ($(BOXSERIES), hd51)
 			--enable-filter=scale \
 			--enable-hardcoded-tables \
 			--cpu=cortex-a15 \
-			--extra-cflags="-Wno-deprecated-declarations -I$(TARGETINCLUDE) -mfpu=neon-vfpv4 -mfloat-abi=hard"
+			--extra-cflags="-Wno-deprecated-declarations -I$(TARGET_INCLUDE_DIR) -mfpu=neon-vfpv4 -mfloat-abi=hard"
 endif
 
 $(D)/ffmpeg: $(FFMPEG_DEPS) | $(TARGET_DIR)
@@ -456,9 +456,9 @@ $(D)/libncurses: $(ARCHIVE)/ncurses-$(LIBNCURSES_VER).tar.gz | $(TARGET_DIR)
 	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
-	ln -sf ./ncurses/curses.h $(TARGETINCLUDE)/ncurses.h
-	ln -sf ./ncurses/term.h $(TARGETINCLUDE)/term.h
+	ln -sf ./ncurses/curses.h $(TARGET_INCLUDE_DIR)/curses.h
+	ln -sf ./ncurses/curses.h $(TARGET_INCLUDE_DIR)/ncurses.h
+	ln -sf ./ncurses/term.h $(TARGET_INCLUDE_DIR)/term.h
 	$(REMOVE)/ncurses-$(LIBNCURSES_VER)
 	touch $@
 
@@ -546,10 +546,10 @@ $(D)/libdpf: $(D)/libusb_compat $(ARCHIVE)/dpf-ax_svn$(DPF-AX_REV).tar.gz | $(TA
 	cd $(BUILD_TMP)/dpf-ax_svn$(DPF-AX_REV)/dpflib && \
 		$(PATCH)/libdpf-crossbuild.diff; \
 		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/; \
-		cp ../include/usbuser.h $(TARGETINCLUDE)/libdpf/; \
+		mkdir -p $(TARGET_INCLUDE_DIR)/libdpf; \
+		cp dpf.h $(TARGET_INCLUDE_DIR)/libdpf/libdpf.h; \
+		cp ../include/spiflash.h $(TARGET_INCLUDE_DIR)/libdpf/; \
+		cp ../include/usbuser.h $(TARGET_INCLUDE_DIR)/libdpf/; \
 		cp libdpf.a $(TARGET_LIB_DIR)/
 	$(REMOVE)/dpf-ax_svn$(DPF-AX_REV)
 	touch $@
@@ -576,8 +576,8 @@ $(D)/libsigc++: $(ARCHIVE)/libsigc++-$(LIBSIGCPP_VER).tar.xz | $(TARGET_DIR)
 			--enable-silent-rules; \
 		$(MAKE); \
 		make install DESTDIR=$(TARGET_DIR); \
-	ln -sf ./sigc++-2.0/sigc++ $(TARGETINCLUDE)/sigc++
-	cp $(BUILD_TMP)/libsigc++-$(LIBSIGCPP_VER)/sigc++config.h $(TARGETINCLUDE)
+	ln -sf ./sigc++-2.0/sigc++ $(TARGET_INCLUDE_DIR)/sigc++
+	cp $(BUILD_TMP)/libsigc++-$(LIBSIGCPP_VER)/sigc++config.h $(TARGET_INCLUDE_DIR)
 	$(REWRITE_LIBTOOL)/libsigc-2.0.la
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/sigc++-2.0.pc
 	$(REMOVE)/libsigc++-$(LIBSIGCPP_VER)
@@ -607,7 +607,7 @@ $(D)/luaexpat: $(ARCHIVE)/luaexpat-$(LUA_EXPAT_VER).tar.gz $(D)/expat | $(TARGET
 		$(PATCH)/luaexpat-lua-5.2-test-fix.patch; \
 		$(MAKE) \
 		CC=$(TARGET)-gcc LUA_V=$(LUA_ABIVER) LDFLAGS="$(TARGET_LDFLAGS)" \
-		LUA_INC=-I$(TARGETINCLUDE) EXPAT_INC=-I$(TARGETINCLUDE); \
+		LUA_INC=-I$(TARGET_INCLUDE_DIR) EXPAT_INC=-I$(TARGET_INCLUDE_DIR); \
 		$(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)
@@ -622,7 +622,7 @@ $(D)/luacurl: $(D)/libcurl $(D)/lua $(ARCHIVE)/Lua-cURL$(LUACURL_VER).tar.xz | $
 			LUA_CMOD=/lib/lua/$(LUA_ABIVER) \
 			LUA_LMOD=/share/lua/$(LUA_ABIVER) \
 			LIBDIR=$(TARGET_LIB_DIR) \
-			LUA_INC=$(TARGETINCLUDE) \
+			LUA_INC=$(TARGET_INCLUDE_DIR) \
 			CURL_LIBS="$(TARGET_LDFLAGS) -lcurl" \
 			$(MAKE); \
 			LUA_CMOD=/lib/lua/$(LUA_ABIVER) \
diff --git a/make/system-tools.mk b/make/system-tools.mk
index 749738f8..280b5c0d 100644
--- a/make/system-tools.mk
+++ b/make/system-tools.mk
@@ -37,7 +37,7 @@ $(D)/openssh: $(D)/openssl $(D)/zlib $(ARCHIVE)/openssh-$(OPENSSH_VER).tar.gz |
 		--infodir=/.remove \
 		--with-pid-dir=/tmp \
 		--with-privsep-path=/var/empty \
-		--with-cppflags="-pipe $(TARGET_O_CFLAGS) $(TARGET_MARCH_CFLAGS) -g -I$(TARGETINCLUDE)" \
+		--with-cppflags="-pipe $(TARGET_O_CFLAGS) $(TARGET_MARCH_CFLAGS) -g -I$(TARGET_INCLUDE_DIR)" \
 		--with-ldflags="-L$(TARGET_LIB_DIR)" \
 		--libexecdir=/bin \
 		--disable-strip \
@@ -279,7 +279,7 @@ $(D)/inadyn: $(D)/openssl $(D)/confuse $(D)/libite $(ARCHIVE)/inadyn-$(INADYN_VE
 		$(CONFIGURE) \
 			--prefix= \
 			--libdir=$(TARGET_LIB_DIR) \
-			--includedir=$(TARGETINCLUDE) \
+			--includedir=$(TARGET_INCLUDE_DIR) \
 			--mandir=/.remove \
 			--docdir=/.remove \
 			--enable-openssl && \
@@ -669,7 +669,7 @@ $(D)/lcd4linux: $(D)/libncurses $(D)/libgd2 $(D)/libdpf | $(TARGET_DIR)
 		./bootstrap && \
 		$(CONFIGURE) \
 			--libdir=$(TARGET_LIB_DIR) \
-			--includedir=$(TARGETINCLUDE) \
+			--includedir=$(TARGET_INCLUDE_DIR) \
 			--bindir=$(TARGET_DIR)/bin \
 			--prefix= \
 			--mandir=/.remove \
@@ -707,7 +707,7 @@ $(D)/xupnpd: $(D)/lua $(D)/openssl | $(TARGET_DIR)
 		$(PATCH)/xupnpd-add-configuration-files.diff
 	pushd $(BUILD_TMP)/xupnpd/src && \
 		$(BUILDENV) \
-		$(MAKE) embedded TARGET=$(TARGET) CC=$(TARGET)-gcc STRIP=$(TARGET)-strip LUAFLAGS="$(TARGET_LDFLAGS) -I$(TARGETINCLUDE)" && \
+		$(MAKE) embedded TARGET=$(TARGET) CC=$(TARGET)-gcc STRIP=$(TARGET)-strip LUAFLAGS="$(TARGET_LDFLAGS) -I$(TARGET_INCLUDE_DIR)" && \
 	install -D -m 0755 xupnpd $(BIN)/ && \
 	mkdir -p $(TARGET_DIR)/share/xupnpd/config && \
 	for object in *.lua plugins/ profiles/ ui/ www/; do \