- update CMAKE variables

* use TARGET_LIB_DIR and TARGET_INCLUDE_DIR variables

make/environment-build.mk

@@ -301,13 +301,17 @@ CONFIGURE = \
 	$(BUILDENV) \
 	./configure $(CONFIGURE_OPTS)
 
-CMAKEENV = \
+CMAKE_OPTS = \
+	-DBUILD_SHARED_LIBS=ON \
+	-DENABLE_STATIC=OFF \
 	-DCMAKE_BUILD_TYPE="None" \
 	-DCMAKE_SYSTEM_NAME="Linux" \
-	-DCMAKE_SYSTEM_PROCESSOR="arm" \
+	-DCMAKE_SYSTEM_PROCESSOR="$(BOXARCH)" \
 	-DCMAKE_INSTALL_PREFIX="" \
-	-DCMAKE_INSTALL_DOCDIR=/.remove \
-	-DCMAKE_INSTALL_MANDIR=/.remove \
+	-DCMAKE_INSTALL_DOCDIR="/.remove" \
+	-DCMAKE_INSTALL_MANDIR="/.remove" \
+	-DCMAKE_PREFIX_PATH="$(TARGET_DIR)" \
+	-DCMAKE_INCLUDE_PATH="$(TARGET_INCLUDE_DIR)" \
 	-DCMAKE_C_COMPILER="$(TARGET)-gcc" \
 	-DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -DNDEBUG" \
 	-DCMAKE_CXX_COMPILER="$(TARGET)-g++" \
@@ -317,11 +321,11 @@ CMAKEENV = \
 	-DCMAKE_NM="$(TARGET)-nm" \
 	-DCMAKE_OBJDUMP="$(TARGET)-objdump" \
 	-DCMAKE_RANLIB="$(TARGET)-ranlib" \
-	-DCMAKE_STRIP="$(TARGET)-strip" \
+	-DCMAKE_STRIP="$(TARGET)-strip"
 
 CMAKE = \
 	rm -f CMakeCache.txt; \
-	cmake $(CMAKEENV)
+	cmake --no-warn-unused-cli $(CMAKE_OPTS)
 
 GITHUB			= https://github.com
 BITBUCKET		= https://bitbucket.org

make/gstreamer.mk

@@ -93,7 +93,7 @@ $(D)/gst_plugins_base: $(D)/zlib $(D)/libglib2 $(D)/orc $(D)/gstreamer $(D)/alsa
 			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	for i in `cd $(TARGET_DIR)/lib/gstreamer-1.0; echo *.la`; do \
+	for i in `cd $(TARGET_LIB_DIR)/gstreamer-1.0; echo *.la`; do \
 		$(REWRITE_LIBTOOL)/gstreamer-1.0/$$i; \
 	done
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gstreamer-allocators-1.0.pc
@@ -160,7 +160,7 @@ $(D)/gst_plugins_good: $(D)/libpng $(D)/libjpeg $(D)/gstreamer $(D)/gst_plugins_
 			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	for i in `cd $(TARGET_DIR)/lib/gstreamer-1.0; echo *.la`; do \
+	for i in `cd $(TARGET_LIB_DIR)/gstreamer-1.0; echo *.la`; do \
 		$(REWRITE_LIBTOOL)/gstreamer-1.0/$$i; \
 	done
 	$(REMOVE)/gst-plugins-good-$(GST_PLUGINS_GOOD_VER)
@@ -201,7 +201,7 @@ $(D)/gst_plugins_bad: $(D)/libass $(D)/libcurl $(D)/libxml2 $(D)/openssl $(D)/li
 			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	for i in `cd $(TARGET_DIR)/lib/gstreamer-1.0; echo *.la`; do \
+	for i in `cd $(TARGET_LIB_DIR)/gstreamer-1.0; echo *.la`; do \
 		$(REWRITE_LIBTOOL)/gstreamer-1.0/$$i; \
 	done
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gstreamer-codecparsers-1.0.pc
@@ -253,7 +253,7 @@ $(D)/gst_plugins_ugly: $(D)/gstreamer $(D)/gst_plugins_base $(ARCHIVE)/$(GST_PLU
 			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	for i in `cd $(TARGET_DIR)/lib/gstreamer-1.0; echo *.la`; do \
+	for i in `cd $(TARGET_LIB_DIR)/gstreamer-1.0; echo *.la`; do \
 		$(REWRITE_LIBTOOL)/gstreamer-1.0/$$i; \
 	done
 	$(REMOVE)/gst-plugins-ugly-$(GST_PLUGINS_UGLY_VER)
@@ -282,7 +282,7 @@ $(D)/gst_plugin_subsink: $(D)/gstreamer $(D)/gst_plugins_base $(D)/gst_plugins_g
 			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	for i in `cd $(TARGET_DIR)/lib/gstreamer-1.0; echo *.la`; do \
+	for i in `cd $(TARGET_LIB_DIR)/gstreamer-1.0; echo *.la`; do \
 		$(REWRITE_LIBTOOL)/gstreamer-1.0/$$i; \
 	done
 	$(REMOVE)/gstreamer$(GST_PLUGIN_SUBSINK_VER)-plugin-subsink
@@ -322,7 +322,7 @@ $(D)/gst_plugins_dvbmediasink: $(D)/gstreamer $(D)/gst_plugins_base $(D)/gst_plu
 			; \
 		$(MAKE) all; \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	for i in `cd $(TARGET_DIR)/lib/gstreamer-1.0; echo *.la`; do \
+	for i in `cd $(TARGET_LIB_DIR)/gstreamer-1.0; echo *.la`; do \
 		$(REWRITE_LIBTOOL)/gstreamer-1.0/$$i; \
 	done
 	$(REMOVE)/gstreamer$(GST_PLUGINS_DVBMEDIASINK_VER)-plugin-dvbmediasink

make/system-libs.mk

@@ -152,7 +152,7 @@ $(D)/libcurl: $(D)/zlib $(D)/openssl $(D)/librtmp $(D)/ca-bundle $(ARCHIVE)/curl
 			--with-ca-bundle=$(CA-BUNDLE_DIR)/$(CA-BUNDLE) \
 			--with-random=/dev/urandom \
 			--with-ssl=$(TARGET_DIR) \
-			--with-librtmp=$(TARGET_DIR)/lib \
+			--with-librtmp=$(TARGET_LIB_DIR) \
 			$(CURL_IPV6) \
 			--enable-optimize \
 			; \
@@ -283,11 +283,11 @@ $(D)/libjpeg-turbo2: $(ARCHIVE)/$(LIBJPEG-TURBO2_SOURCE) | $(TARGET_DIR)
 		$(call apply_patches,$(LIBJPEG-TURBO2_PATCH)); \
 		$(CMAKE) \
 			-DWITH_SIMD=False \
-			-DENABLE_STATIC=OFF \
 			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	rm -f $(addprefix $(TARGET_DIR)/bin/,cjpeg djpeg jpegtran rdjpgcom wrjpgcom tjbench)
+	rm -f $(TARGET_LIB_DIR)/cmake
 	$(REMOVE)/libjpeg-turbo-$(LIBJPEG-TURBO2_VER)
 	$(TOUCH)
 
@@ -393,6 +393,7 @@ $(D)/openthreads: $(SOURCE_DIR)/$(NI_OPENTHREADS) | $(TARGET_DIR)
 			; \
 		$(MAKE); \
 		make install DESTDIR=$(TARGET_DIR)
+	rm -f $(TARGET_LIB_DIR)/cmake
 	$(REMOVE)/$(NI_OPENTHREADS)
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/openthreads.pc
 	$(TOUCH)
@@ -844,13 +845,10 @@ $(D)/pugixml: $(ARCHIVE)/pugixml-$(PUGIXML_VER).tar.gz | $(TARGET_DIR)
 	$(UNTAR)/pugixml-$(PUGIXML_VER).tar.gz
 	$(CHDIR)/pugixml-$(PUGIXML_VER); \
 		$(call apply_patches, $(PUGIXML_PATCH)); \
-		$(CMAKE) \
-			--no-warn-unused-cli \
-			-DBUILD_SHARED_LIBS="ON" \
-			; \
+		$(CMAKE); \
 		$(MAKE); \
 		make install DESTDIR=$(TARGET_DIR)
-	rm -rf $(TARGET_DIR)/lib/cmake
+	rm -rf $(TARGET_LIB_DIR)/cmake
 	$(REMOVE)/pugixml-$(PUGIXML_VER)
 	$(TOUCH)
 
@@ -860,7 +858,7 @@ $(D)/librtmp: $(D)/zlib $(D)/openssl $(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 CROSS_COMPILE=$(TARGET)- XCFLAGS="-I$(TARGET_DIR)/include -L$(TARGET_DIR)/lib" LDFLAGS="-L$(TARGET_DIR)/lib" prefix=$(TARGET_DIR);\
+		make CROSS_COMPILE=$(TARGET)- XCFLAGS="-I$(TARGET_INCLUDE_DIR) -L$(TARGET_LIB_DIR)" LDFLAGS="-L$(TARGET_LIB_DIR)" prefix=$(TARGET_DIR);\
 		make install DESTDIR=$(TARGET_DIR) prefix="" mandir=/.remove
 	rm -rf $(TARGET_DIR)/sbin/rtmpgw
 	rm -rf $(TARGET_DIR)/sbin/rtmpsrv

make/system-tools.mk

@@ -1032,7 +1032,7 @@ $(D)/streamripper: $(D)/libvorbisidec $(D)/libmad $(D)/libglib2 | $(TARGET_DIR)
 		autoreconf -fi; \
 		$(CONFIGURE) \
 			--prefix= \
-			--includedir=$(TARGET_DIR)/include \
+			--includedir=$(TARGET_INCLUDE_DIR) \
 			--datarootdir=/.remove \
 			--with-included-argv=yes \
 			--with-included-libmad=no \