diff --git a/make/development-tools.mk b/make/development-tools.mk
index 53c73599..c5f23db4 100644
--- a/make/development-tools.mk
+++ b/make/development-tools.mk
@@ -30,7 +30,7 @@ $(D)/valgrind-hd2: $(ARCHIVE)/valgrind-$(VALGRIND_VER).tar.bz2 | $(TARGET_DIR)
 			; \
 		$(MAKE) all; \
 		make install DESTDIR=$(TARGET_DIR)
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/valgrind.pc
+	$(REWRITE_PKGCONF)/valgrind.pc
 	rm $(TARGET_DIR)/bin/callgrind_annotate
 	rm $(TARGET_DIR)/bin/callgrind_control
 	rm $(TARGET_DIR)/bin/cg_annotate
@@ -59,7 +59,7 @@ $(D)/valgrind-hd1:
 			; \
 		$(MAKE) all; \
 		make install DESTDIR=$(TARGET_DIR)
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/valgrind.pc
+	$(REWRITE_PKGCONF)/valgrind.pc
 	$(REMOVE)/valgrind
 	$(TOUCH)
 
diff --git a/make/environment-build.mk b/make/environment-build.mk
index 4a9be660..b80288a7 100644
--- a/make/environment-build.mk
+++ b/make/environment-build.mk
@@ -270,7 +270,9 @@ PKG_CONFIG_PATH = $(PKG_CONFIG_LIBDIR)/pkgconfig
 REWRITE_RULES          = sed -i -e "s,^libdir=.*,libdir='$(TARGET_LIB_DIR)'," -e "s,\(^dependency_libs='\| \|-L\|^dependency_libs='\)/lib,\ $(TARGET_LIB_DIR),g"
 REWRITE_LIBTOOL        = $(REWRITE_RULES) $(TARGET_LIB_DIR)
 REWRITE_LIBTOOL_STATIC = $(REWRITE_RULES) $(STATIC_LIB_DIR)
-REWRITE_PKGCONF        = sed -i "s,^prefix=.*,prefix='$(TARGET_DIR)',"
+
+REWRITE_CONFIG         = sed -i "s,^prefix=.*,prefix='$(TARGET_DIR)',"
+REWRITE_PKGCONF        = sed -i "s,^prefix=.*,prefix='$(TARGET_DIR)'," $(PKG_CONFIG_PATH)
 
 # unpack tarballs, clean up
 UNTAR = tar -C $(BUILD_TMP) -xf $(ARCHIVE)
diff --git a/make/ffmpeg-armbox.mk b/make/ffmpeg-armbox.mk
index 96b031f7..1d99bd7f 100644
--- a/make/ffmpeg-armbox.mk
+++ b/make/ffmpeg-armbox.mk
@@ -360,12 +360,12 @@ endif
 			; \
 		$(MAKE); \
 		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
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavformat.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavutil.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libswresample.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libswscale.pc
+	$(REWRITE_PKGCONF)/libavcodec.pc
+	$(REWRITE_PKGCONF)/libavdevice.pc
+	$(REWRITE_PKGCONF)/libavfilter.pc
+	$(REWRITE_PKGCONF)/libavformat.pc
+	$(REWRITE_PKGCONF)/libavutil.pc
+	$(REWRITE_PKGCONF)/libswresample.pc
+	$(REWRITE_PKGCONF)/libswscale.pc
 	$(REMOVE)/ffmpeg-$(FFMPEG_VER)
 	$(TOUCH)
diff --git a/make/ffmpeg-coolstream.mk b/make/ffmpeg-coolstream.mk
index a8fe7367..c15720b2 100644
--- a/make/ffmpeg-coolstream.mk
+++ b/make/ffmpeg-coolstream.mk
@@ -185,11 +185,11 @@ $(D)/ffmpeg: $(FFMPEG_DEPS) | $(TARGET_DIR)
 			; \
 		$(MAKE); \
 		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
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavformat.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavutil.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libswresample.pc
+	$(REWRITE_PKGCONF)/libavcodec.pc
+	$(REWRITE_PKGCONF)/libavdevice.pc
+	$(REWRITE_PKGCONF)/libavfilter.pc
+	$(REWRITE_PKGCONF)/libavformat.pc
+	$(REWRITE_PKGCONF)/libavutil.pc
+	$(REWRITE_PKGCONF)/libswresample.pc
 	$(REMOVE)/$(NI_FFMPEG)
 	$(TOUCH)
diff --git a/make/gstreamer.mk b/make/gstreamer.mk
index fbdc8286..ed4c84f0 100644
--- a/make/gstreamer.mk
+++ b/make/gstreamer.mk
@@ -64,10 +64,10 @@ $(D)/gstreamer: $(D)/libglib2 $(D)/libxml2 $(D)/glib-networking $(ARCHIVE)/$(GST
 			; \
 		$(MAKE); \
 		$(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
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gstreamer-net-1.0.pc
+	$(REWRITE_PKGCONF)/gstreamer-1.0.pc
+	$(REWRITE_PKGCONF)/gstreamer-base-1.0.pc
+	$(REWRITE_PKGCONF)/gstreamer-controller-1.0.pc
+	$(REWRITE_PKGCONF)/gstreamer-net-1.0.pc
 	$(REWRITE_LIBTOOL)/libgstreamer-1.0.la
 	$(REWRITE_LIBTOOL)/libgstbase-1.0.la
 	$(REWRITE_LIBTOOL)/libgstcontroller-1.0.la
@@ -110,18 +110,18 @@ $(D)/gst-plugins-base: $(ARCHIVE)/$(GST_PLUGINS_BASE_SOURCE) $(D)/gstreamer $(D)
 	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
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gstreamer-app-1.0.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gstreamer-audio-1.0.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gstreamer-fft-1.0.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gstreamer-pbutils-1.0.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gstreamer-riff-1.0.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gstreamer-rtp-1.0.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gstreamer-rtsp-1.0.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gstreamer-sdp-1.0.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gstreamer-tag-1.0.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gstreamer-video-1.0.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gstreamer-plugins-base-1.0.pc
+	$(REWRITE_PKGCONF)/gstreamer-allocators-1.0.pc
+	$(REWRITE_PKGCONF)/gstreamer-app-1.0.pc
+	$(REWRITE_PKGCONF)/gstreamer-audio-1.0.pc
+	$(REWRITE_PKGCONF)/gstreamer-fft-1.0.pc
+	$(REWRITE_PKGCONF)/gstreamer-pbutils-1.0.pc
+	$(REWRITE_PKGCONF)/gstreamer-riff-1.0.pc
+	$(REWRITE_PKGCONF)/gstreamer-rtp-1.0.pc
+	$(REWRITE_PKGCONF)/gstreamer-rtsp-1.0.pc
+	$(REWRITE_PKGCONF)/gstreamer-sdp-1.0.pc
+	$(REWRITE_PKGCONF)/gstreamer-tag-1.0.pc
+	$(REWRITE_PKGCONF)/gstreamer-video-1.0.pc
+	$(REWRITE_PKGCONF)/gstreamer-plugins-base-1.0.pc
 	$(REWRITE_LIBTOOL)/libgstallocators-1.0.la
 	$(REWRITE_LIBTOOL)/libgstapp-1.0.la
 	$(REWRITE_LIBTOOL)/libgstaudio-1.0.la
@@ -208,14 +208,14 @@ $(D)/gst-plugins-bad: $(ARCHIVE)/$(GST_PLUGINS_BAD_SOURCE) $(D)/gst-plugins-base
 	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-bad-audio-1.0.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gstreamer-bad-video-1.0.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gstreamer-codecparsers-1.0.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gstreamer-insertbin-1.0.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gstreamer-mpegts-1.0.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gstreamer-player-1.0.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gstreamer-plugins-bad-1.0.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gstreamer-webrtc-1.0.pc
+	$(REWRITE_PKGCONF)/gstreamer-bad-audio-1.0.pc
+	$(REWRITE_PKGCONF)/gstreamer-bad-video-1.0.pc
+	$(REWRITE_PKGCONF)/gstreamer-codecparsers-1.0.pc
+	$(REWRITE_PKGCONF)/gstreamer-insertbin-1.0.pc
+	$(REWRITE_PKGCONF)/gstreamer-mpegts-1.0.pc
+	$(REWRITE_PKGCONF)/gstreamer-player-1.0.pc
+	$(REWRITE_PKGCONF)/gstreamer-plugins-bad-1.0.pc
+	$(REWRITE_PKGCONF)/gstreamer-webrtc-1.0.pc
 	$(REWRITE_LIBTOOL)/libgstbasecamerabinsrc-1.0.la
 	$(REWRITE_LIBTOOL)/libgstcodecparsers-1.0.la
 	$(REWRITE_LIBTOOL)/libgstphotography-1.0.la
@@ -431,7 +431,7 @@ $(D)/orc: $(ARCHIVE)/$(ORC_SOURCE)
 			; \
 		$(MAKE) all; \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/orc-0.4.pc
+	$(REWRITE_PKGCONF)/orc-0.4.pc
 	$(REWRITE_LIBTOOL)/liborc-0.4.la
 	$(REWRITE_LIBTOOL)/liborc-test-0.4.la
 	rm -f $(addprefix $(TARGET_DIR)/bin/,orc-bugreport orcc)
@@ -456,8 +456,8 @@ $(D)/libdca: $(ARCHIVE)/$(LIBDCA_SOURCE)
 			; \
 		$(MAKE) all; \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libdca.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libdts.pc
+	$(REWRITE_PKGCONF)/libdca.pc
+	$(REWRITE_PKGCONF)/libdts.pc
 	$(REWRITE_LIBTOOL)/libdca.la
 	rm -f $(addprefix $(TARGET_DIR)/bin/,extract_dca extract_dts)
 	$(REMOVE)/libdca-$(LIBDCA_VER)
@@ -481,8 +481,8 @@ $(D)/nettle: $(D)/gmp $(ARCHIVE)/$(NETTLE_SOURCE)
 			; \
 		$(MAKE) all; \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/hogweed.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/nettle.pc
+	$(REWRITE_PKGCONF)/hogweed.pc
+	$(REWRITE_PKGCONF)/nettle.pc
 	rm -f $(addprefix $(TARGET_DIR)/bin/,sexp-conv nettle-hash nettle-pbkdf2 nettle-lfib-stream pkcs1-conv)
 	$(REMOVE)/nettle-$(NETTLE_VER)
 	$(TOUCH)
@@ -539,7 +539,7 @@ $(D)/gnutls: $(D)/nettle $(D)/ca-bundle $(ARCHIVE)/$(GNUTLS_SOURCE)
 			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gnutls.pc
+	$(REWRITE_PKGCONF)/gnutls.pc
 	$(REWRITE_LIBTOOL)/libgnutls.la
 	$(REWRITE_LIBTOOL)/libgnutlsxx.la
 	rm -f $(addprefix $(TARGET_DIR)/bin/,psktool gnutls-cli-debug certtool srptool ocsptool gnutls-serv gnutls-cli)
@@ -596,7 +596,7 @@ $(D)/libsoup: $(D)/sqlite $(D)/libxml2 $(D)/libglib2 $(ARCHIVE)/$(LIBSOUP_SOURCE
 			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR) itlocaledir=$$(TARGET_DIR)/.remove
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libsoup-2.4.pc
+	$(REWRITE_PKGCONF)/libsoup-2.4.pc
 	$(REWRITE_LIBTOOL)/libsoup-2.4.la
 	$(REMOVE)/libsoup-$(LIBSOUP_VER)
 	$(TOUCH)
@@ -619,7 +619,7 @@ $(D)/sqlite: $(ARCHIVE)/$(SQLITE_SOURCE)
 			; \
 		$(MAKE) all; \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/sqlite3.pc
+	$(REWRITE_PKGCONF)/sqlite3.pc
 	$(REWRITE_LIBTOOL)/libsqlite3.la
 	rm -f $(addprefix $(TARGET_DIR)/bin/,sqlite3)
 	$(REMOVE)/sqlite-autoconf-$(SQLITE_VER)
diff --git a/make/system-libs-extra.mk b/make/system-libs-extra.mk
index ae182dff..22091b4d 100644
--- a/make/system-libs-extra.mk
+++ b/make/system-libs-extra.mk
@@ -48,7 +48,7 @@ $(D)/libFLAC: $(ARCHIVE)/flac-$(LIBFLAC_VER).tar.xz | $(TARGET_DIR)
 			; \
 		$(MAKE) all; \
 		make install DESTDIR=$(TARGET_DIR); \
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/flac.pc
+	$(REWRITE_PKGCONF)/flac.pc
 	$(REWRITE_LIBTOOL)/libFLAC.la
 	rm -rf $(TARGET_DIR)/bin/flac
 	rm -rf $(TARGET_DIR)/bin/metaflac
@@ -75,7 +75,7 @@ $(D)/libroxml: $(ARCHIVE)/libroxml-$(LIBROXML_VER).tar.gz | $(TARGET_DIR)
 			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libroxml.pc
+	$(REWRITE_PKGCONF)/libroxml.pc
 	$(REMOVE)/libroxml-$(LIBROXML_VER)
 	$(TOUCH)
 
@@ -124,7 +124,7 @@ $(D)/fontconfig: $(D)/freetype $(D)/expat $(ARCHIVE)/$(FONTCONFIG_SOURCE) | $(TA
 		$(MAKE) all; \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_LIBTOOL)/libfontconfig.la
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/fontconfig.pc
+	$(REWRITE_PKGCONF)/fontconfig.pc
 	$(REMOVE)/fontconfig-$(FONTCONFIG_VER)
 	$(TOUCH)
 
@@ -155,7 +155,7 @@ $(D)/pixman: $(D)/zlib $(D)/libpng $(ARCHIVE)/$(PIXMAN_SOURCE) | $(TARGET_DIR)
 		$(MAKE) all; \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_LIBTOOL)/libpixman-1.la
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/pixman-1.pc
+	$(REWRITE_PKGCONF)/pixman-1.pc
 	$(REMOVE)/pixman-$(PIXMAN_VER)
 	$(TOUCH)
 
@@ -197,16 +197,16 @@ $(D)/cairo: $(D)/fontconfig $(D)/libglib2 $(D)/libpng $(D)/pixman $(D)/zlib $(AR
 	$(REWRITE_LIBTOOL)/libcairo-script-interpreter.la
 	$(REWRITE_LIBTOOL)/libcairo-gobject.la
 	$(REWRITE_LIBTOOL)/cairo/libcairo-trace.la
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/cairo.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/cairo-fc.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/cairo-ft.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/cairo-gobject.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/cairo-pdf.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/cairo-png.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/cairo-ps.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/cairo-script.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/cairo-svg.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/cairo-tee.pc
+	$(REWRITE_PKGCONF)/cairo.pc
+	$(REWRITE_PKGCONF)/cairo-fc.pc
+	$(REWRITE_PKGCONF)/cairo-ft.pc
+	$(REWRITE_PKGCONF)/cairo-gobject.pc
+	$(REWRITE_PKGCONF)/cairo-pdf.pc
+	$(REWRITE_PKGCONF)/cairo-png.pc
+	$(REWRITE_PKGCONF)/cairo-ps.pc
+	$(REWRITE_PKGCONF)/cairo-script.pc
+	$(REWRITE_PKGCONF)/cairo-svg.pc
+	$(REWRITE_PKGCONF)/cairo-tee.pc
 	$(REMOVE)/cairo-$(CAIRO_VER)
 	$(TOUCH)
 
@@ -239,7 +239,7 @@ $(D)/harfbuzz: $(D)/fontconfig $(D)/libglib2 $(D)/cairo $(D)/freetype $(ARCHIVE)
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_LIBTOOL)/libharfbuzz.la
 	$(REWRITE_LIBTOOL)/libharfbuzz-subset.la
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/harfbuzz.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/harfbuzz-subset.pc
+	$(REWRITE_PKGCONF)/harfbuzz.pc
+	$(REWRITE_PKGCONF)/harfbuzz-subset.pc
 	$(REMOVE)/harfbuzz-$(HARFBUZZ_VER)
 	$(TOUCH)
diff --git a/make/system-libs.mk b/make/system-libs.mk
index 7b1e55bd..66688986 100644
--- a/make/system-libs.mk
+++ b/make/system-libs.mk
@@ -25,7 +25,7 @@ $(D)/zlib: $(ARCHIVE)/zlib-$(ZLIB_VER).tar.gz | $(TARGET_DIR)
 			; \
 		$(MAKE); \
 		$(MAKE) install prefix=$(TARGET_DIR)
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/zlib.pc
+	$(REWRITE_PKGCONF)/zlib.pc
 	$(REMOVE)/zlib-$(ZLIB_VER)
 	$(TOUCH)
 
@@ -50,7 +50,7 @@ $(D)/libfuse: $(ARCHIVE)/fuse-$(FUSE_VER).tar.gz | $(TARGET_DIR)
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_LIBTOOL)/libfuse.la
 	$(REWRITE_LIBTOOL)/libulockmgr.la
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/fuse.pc
+	$(REWRITE_PKGCONF)/fuse.pc
 	rm -rf $(TARGET_DIR)/etc/udev
 	rm -rf $(TARGET_DIR)/etc/init.d/fuse
 	$(REMOVE)/fuse-$(FUSE_VER)
@@ -73,7 +73,7 @@ $(D)/libupnp: $(ARCHIVE)/libupnp-$(LIBUPNP_VER).tar.bz2 | $(TARGET_DIR)
 	$(REWRITE_LIBTOOL)/libixml.la
 	$(REWRITE_LIBTOOL)/libthreadutil.la
 	$(REWRITE_LIBTOOL)/libupnp.la
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libupnp.pc
+	$(REWRITE_PKGCONF)/libupnp.pc
 	$(TOUCH)
 	
 # -----------------------------------------------------------------------------
@@ -101,7 +101,7 @@ $(D)/libdvbsi: $(ARCHIVE)/libdvbsi-.git | $(TARGET_DIR)
 		make install DESTDIR=$(TARGET_DIR); \
 	$(REMOVE)/libdvbsi-.git
 	$(REWRITE_LIBTOOL)/libdvbsi++.la
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libdvbsi++.pc
+	$(REWRITE_PKGCONF)/libdvbsi++.pc
 	$(TOUCH)
 
 # -----------------------------------------------------------------------------
@@ -168,7 +168,7 @@ $(D)/libcurl: $(D)/zlib $(D)/openssl $(D)/librtmp $(D)/ca-bundle $(ARCHIVE)/curl
 		make install DESTDIR=$(TARGET_DIR)
 	rm -rf $(TARGET_DIR)/bin/curl-config $(TARGET_DIR)/share/zsh
 	$(REWRITE_LIBTOOL)/libcurl.la
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libcurl.pc
+	$(REWRITE_PKGCONF)/libcurl.pc
 	$(REMOVE)/curl-$(LIBCURL_VER)
 	$(TOUCH)
 
@@ -294,8 +294,8 @@ $(D)/libjpeg-turbo2: $(ARCHIVE)/$(LIBJPEG-TURBO2_SOURCE) | $(TARGET_DIR)
 			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libturbojpeg.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libjpeg.pc
+	$(REWRITE_PKGCONF)/libturbojpeg.pc
+	$(REWRITE_PKGCONF)/libjpeg.pc
 	rm -f $(addprefix $(TARGET_DIR)/bin/,cjpeg djpeg jpegtran rdjpgcom tjbench wrjpgcom)
 	$(REMOVE)/libjpeg-turbo-$(LIBJPEG-TURBO2_VER)
 	$(TOUCH)
@@ -335,9 +335,9 @@ $(D)/openssl: $(ARCHIVE)/openssl-$(OPENSSL_VER).tar.gz | $(TARGET_DIR)
 		sed -i "s# build_tests##" Makefile; \
 		make $(OPENSSLFLAGS) all; \
 		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
+	$(REWRITE_PKGCONF)/openssl.pc
+	$(REWRITE_PKGCONF)/libcrypto.pc
+	$(REWRITE_PKGCONF)/libssl.pc
 	rm -rf $(TARGET_DIR)/bin/c_rehash $(TARGET_LIB_DIR)/engines
 ifneq ($(BOXSERIES), hd51)
 	rm -rf $(TARGET_DIR)/bin/openssl
@@ -382,8 +382,8 @@ $(D)/libncurses: $(ARCHIVE)/ncurses-$(LIBNCURSES_VER).tar.gz | $(TARGET_DIR)
 	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
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/ncurses.pc
+	$(REWRITE_CONFIG) $(HOST_DIR)/bin/ncurses6-config
+	$(REWRITE_PKGCONF)/ncurses.pc
 	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
@@ -404,7 +404,7 @@ $(D)/openthreads: $(SOURCE_DIR)/$(NI_OPENTHREADS) | $(TARGET_DIR)
 		make install DESTDIR=$(TARGET_DIR)
 	rm -f $(TARGET_LIB_DIR)/cmake
 	$(REMOVE)/$(NI_OPENTHREADS)
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/openthreads.pc
+	$(REWRITE_PKGCONF)/openthreads.pc
 	$(TOUCH)
 
 # -----------------------------------------------------------------------------
@@ -421,7 +421,7 @@ $(D)/libusb: $(ARCHIVE)/libusb-$(LIBUSB_VER).tar.bz2 | $(TARGET_DIR)
 		make install DESTDIR=$(TARGET_DIR); \
 	$(REMOVE)/libusb-$(LIBUSB_VER)
 	$(REWRITE_LIBTOOL)/libusb-$(LIBUSB_MAJ).la
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libusb-$(LIBUSB_MAJ).pc
+	$(REWRITE_PKGCONF)/libusb-$(LIBUSB_MAJ).pc
 	$(TOUCH)
 
 # -----------------------------------------------------------------------------
@@ -437,9 +437,9 @@ $(D)/libusb_compat: $(ARCHIVE)/libusb-compat-$(LIBUSB_COMPAT_VER).tar.bz2 $(D)/l
 		make install DESTDIR=$(TARGET_DIR); \
 	$(REMOVE)/libusb-compat-$(LIBUSB_COMPAT_VER)
 	mv $(TARGET_DIR)/bin/libusb-config $(HOST_DIR)/bin
-	$(REWRITE_PKGCONF) $(HOST_DIR)/bin/libusb-config
+	$(REWRITE_CONFIG) $(HOST_DIR)/bin/libusb-config
 	$(REWRITE_LIBTOOL)/libusb.la
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libusb.pc
+	$(REWRITE_PKGCONF)/libusb.pc
 	$(TOUCH)
 
 # -----------------------------------------------------------------------------
@@ -460,7 +460,7 @@ $(D)/libgd2: $(D)/zlib $(D)/libpng $(D)/libjpeg $(D)/freetype $(ARCHIVE)/libgd-$
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REMOVE)/libgd-$(LIBGD_VER)
 	$(REWRITE_LIBTOOL)/libgd.la
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gdlib.pc
+	$(REWRITE_PKGCONF)/gdlib.pc
 	$(TOUCH)
 
 # -----------------------------------------------------------------------------
@@ -520,7 +520,7 @@ $(D)/libsigc++: $(ARCHIVE)/libsigc++-$(LIBSIGCPP_VER).tar.xz | $(TARGET_DIR)
 	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
+	$(REWRITE_PKGCONF)/sigc++-2.0.pc
 	$(REMOVE)/libsigc++-$(LIBSIGCPP_VER)
 	$(TOUCH)
 
@@ -540,7 +540,7 @@ $(D)/expat: $(ARCHIVE)/expat-$(EXPAT_VER).tar.bz2 | $(TARGET_DIR)
 			; \
 		$(MAKE); \
 		make install DESTDIR=$(TARGET_DIR)
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/expat.pc
+	$(REWRITE_PKGCONF)/expat.pc
 	$(REWRITE_LIBTOOL)/libexpat.la
 	$(REMOVE)/expat-$(EXPAT_VER)
 	$(TOUCH)
@@ -650,7 +650,7 @@ $(D)/lua: $(D)/libncurses $(ARCHIVE)/lua-$(LUA_VER).tar.gz | $(TARGET_DIR)
 	install -D -m 0755 $(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 -D -m 0644 $(BUILD_TMP)/lua-$(LUA_VER)/etc/lua.pc $(PKG_CONFIG_PATH)/lua.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/lua.pc
+	$(REWRITE_PKGCONF)/lua.pc
 	rm -rf $(TARGET_DIR)/bin/luac
 	$(REMOVE)/lua-$(LUA_VER)
 	make lua-libs
@@ -690,7 +690,7 @@ $(D)/libbluray: $(LIBBLURAY_DEPS) $(ARCHIVE)/libbluray-$(LIBBLURAY_VER).tar.bz2
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_LIBTOOL)/libbluray.la
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libbluray.pc
+	$(REWRITE_PKGCONF)/libbluray.pc
 	$(REMOVE)/libbluray-$(LIBBLURAY_VER)
 	$(TOUCH)
 
@@ -713,7 +713,7 @@ $(D)/libass: $(D)/freetype $(D)/libfribidi $(ARCHIVE)/libass-$(LIBASS_VER).tar.x
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REMOVE)/libass-$(LIBASS_VER)
 	$(REWRITE_LIBTOOL)/libass.la
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libass.pc
+	$(REWRITE_PKGCONF)/libass.pc
 	$(TOUCH)
 	
 # -----------------------------------------------------------------------------
@@ -737,7 +737,7 @@ $(D)/libgpg-error: $(ARCHIVE)/libgpg-error-$(LIBGPG-ERROR_VER).tar.bz2 | $(TARGE
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	mv $(TARGET_DIR)/bin/gpg-error-config $(HOST_DIR)/bin
-	$(REWRITE_PKGCONF) $(HOST_DIR)/bin/gpg-error-config
+	$(REWRITE_CONFIG) $(HOST_DIR)/bin/gpg-error-config
 	$(REWRITE_LIBTOOL)/libgpg-error.la
 	rm -rf $(TARGET_DIR)/bin/gpg-error
 	rm -rf $(TARGET_DIR)/share/common-lisp
@@ -763,7 +763,7 @@ $(D)/libgcrypt: $(ARCHIVE)/libgcrypt-$(LIBGCRYPT_VER).tar.gz $(D)/libgpg-error |
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	mv $(TARGET_DIR)/bin/libgcrypt-config $(HOST_DIR)/bin
-	$(REWRITE_PKGCONF) $(HOST_DIR)/bin/libgcrypt-config
+	$(REWRITE_CONFIG) $(HOST_DIR)/bin/libgcrypt-config
 	$(REWRITE_LIBTOOL)/libgcrypt.la
 	rm -rf $(TARGET_DIR)/bin/dumpsexp
 	rm -rf $(TARGET_DIR)/bin/hmac256
@@ -787,7 +787,7 @@ $(D)/libaacs: $(ARCHIVE)/libaacs-$(LIBAACS_VER).tar.bz2 $(D)/libgcrypt | $(TARGE
 			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libaacs.pc
+	$(REWRITE_PKGCONF)/libaacs.pc
 	$(REWRITE_LIBTOOL)/libaacs.la
 	$(REMOVE)/libaacs-$(LIBAACS_VER)
 	cd $(TARGET_DIR); \
@@ -811,7 +811,7 @@ $(D)/libbdplus: $(ARCHIVE)/libbdplus-$(LIBBDPLUS_VER).tar.bz2 $(D)/libaacs | $(T
 			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libbdplus.pc
+	$(REWRITE_PKGCONF)/libbdplus.pc
 	$(REWRITE_LIBTOOL)/libbdplus.la
 	$(REMOVE)/libbdplus-$(LIBBDPLUS_VER)
 	cd $(TARGET_DIR); \
@@ -844,8 +844,8 @@ $(D)/libxml2: $(ARCHIVE)/libxml2-$(LIBXML2_VER).tar.gz | $(TARGET_DIR)
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	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
+	$(REWRITE_PKGCONF)/libxml-2.0.pc
+	$(REWRITE_CONFIG) $(HOST_DIR)/bin/xml2-config
 	rm -rf $(TARGET_LIB_DIR)/xml2Conf.sh
 	rm -rf $(TARGET_LIB_DIR)/cmake
 	$(REMOVE)/libxml2-$(LIBXML2_VER)
@@ -878,7 +878,7 @@ $(D)/librtmp: $(D)/zlib $(D)/openssl $(SOURCE_DIR)/$(NI_RTMPDUMP) | $(TARGET_DIR
 	rm -rf $(TARGET_DIR)/sbin/rtmpgw
 	rm -rf $(TARGET_DIR)/sbin/rtmpsrv
 	rm -rf $(TARGET_DIR)/sbin/rtmpsuck
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/librtmp.pc
+	$(REWRITE_PKGCONF)/librtmp.pc
 	$(REMOVE)/$(NI_RTMPDUMP)
 	$(TOUCH)
 
@@ -908,7 +908,7 @@ $(D)/libtirpc: $(ARCHIVE)/libtirpc-$(LIBTIRPC_VER).tar.bz2 | $(TARGET_DIR)
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_LIBTOOL)/libtirpc.la
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libtirpc.pc
+	$(REWRITE_PKGCONF)/libtirpc.pc
 	$(REMOVE)/libtirpc-$(LIBTIRPC_VER)
 	$(TOUCH)
 
@@ -928,7 +928,7 @@ $(D)/confuse: $(ARCHIVE)/confuse-$(CONFUSE_VER).tar.xz | $(TARGET_DIR)
 			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libconfuse.pc
+	$(REWRITE_PKGCONF)/libconfuse.pc
 	$(REMOVE)/confuse-$(CONFUSE_VER)
 	$(TOUCH)
 
@@ -948,7 +948,7 @@ $(D)/libite: $(ARCHIVE)/libite-$(ITE_VER).tar.xz | $(TARGET_DIR)
 			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libite.pc
+	$(REWRITE_PKGCONF)/libite.pc
 	$(REMOVE)/libite-$(ITE_VER)
 	$(TOUCH)
 
@@ -997,7 +997,7 @@ $(D)/libvorbisidec: $(ARCHIVE)/libvorbisidec_$(LIBVORBISIDEC_VER).orig.tar.gz $(
 		make all; \
 		make install DESTDIR=$(TARGET_DIR); \
 	$(REMOVE)/libvorbisidec-$(LIBVORBISIDEC_VER)
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/vorbisidec.pc
+	$(REWRITE_PKGCONF)/vorbisidec.pc
 	$(REWRITE_LIBTOOL)/libvorbisidec.la
 	$(TOUCH)
 
@@ -1014,7 +1014,7 @@ $(D)/libogg: $(ARCHIVE)/libogg-$(LIBOGG_VER).tar.xz | $(TARGET_DIR)
 			; \
 		$(MAKE); \
 		make install DESTDIR=$(TARGET_DIR)
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/ogg.pc
+	$(REWRITE_PKGCONF)/ogg.pc
 	$(REWRITE_LIBTOOL)/libogg.la
 	$(REMOVE)/libogg-$(LIBOGG_VER)
 	$(TOUCH)
@@ -1035,7 +1035,7 @@ $(D)/libfribidi: $(ARCHIVE)/fribidi-$(FRIBIDI_VER).tar.bz2 | $(TARGET_DIR)
 			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/fribidi.pc
+	$(REWRITE_PKGCONF)/fribidi.pc
 	$(REWRITE_LIBTOOL)/libfribidi.la
 	$(REMOVE)/fribidi-$(FRIBIDI_VER)
 	$(TOUCH)
@@ -1061,7 +1061,7 @@ $(D)/libffi: $(ARCHIVE)/libffi-$(LIBFFI_VER).tar.gz
 			; \
 		$(MAKE) all; \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libffi.pc
+	$(REWRITE_PKGCONF)/libffi.pc
 	$(REWRITE_LIBTOOL)/libffi.la
 	$(REMOVE)/libffi-$(LIBFFI_VER)
 	$(TOUCH)
@@ -1119,14 +1119,14 @@ $(D)/libglib2: $(ARCHIVE)/glib-$(GLIB_VER).tar.xz $(D)/zlib $(LIBGLIB2_DEPS) $(D
 	rm -rf $(TARGET_DIR)/bin/gresource
 	rm -rf $(TARGET_DIR)/bin/gsettings
 	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
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gmodule-2.0.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gmodule-export-2.0.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gmodule-no-export-2.0.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gobject-2.0.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gthread-2.0.pc
+	$(REWRITE_PKGCONF)/gio-2.0.pc
+	$(REWRITE_PKGCONF)/gio-unix-2.0.pc
+	$(REWRITE_PKGCONF)/glib-2.0.pc
+	$(REWRITE_PKGCONF)/gmodule-2.0.pc
+	$(REWRITE_PKGCONF)/gmodule-export-2.0.pc
+	$(REWRITE_PKGCONF)/gmodule-no-export-2.0.pc
+	$(REWRITE_PKGCONF)/gobject-2.0.pc
+	$(REWRITE_PKGCONF)/gthread-2.0.pc
 	$(REWRITE_LIBTOOL)/libgio-2.0.la
 	$(REWRITE_LIBTOOL)/libglib-2.0.la
 	$(REWRITE_LIBTOOL)/libgmodule-2.0.la
@@ -1164,7 +1164,7 @@ $(D)/alsa-lib: $(ARCHIVE)/$(ALSA-LIB_SOURCE)
 			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/alsa.pc
+	$(REWRITE_PKGCONF)/alsa.pc
 	$(REWRITE_LIBTOOL)/libasound.la
 	$(REMOVE)/alsa-lib-$(ALSA-LIB_VER)
 	$(TOUCH)
diff --git a/make/system-tools-extra.mk b/make/system-tools-extra.mk
index 92008eaa..2d235165 100644
--- a/make/system-tools-extra.mk
+++ b/make/system-tools-extra.mk
@@ -102,10 +102,10 @@ $(D)/iptables: $(ARCHIVE)/iptables-$(IPTABLES_VER).tar.bz2 | $(TARGET_DIR)
 	$(REWRITE_LIBTOOL)/libip6tc.la
 	$(REWRITE_LIBTOOL)/libiptc.la
 	$(REWRITE_LIBTOOL)/libxtables.la
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libip4tc.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libip6tc.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libiptc.pc
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/xtables.pc
+	$(REWRITE_PKGCONF)/libip4tc.pc
+	$(REWRITE_PKGCONF)/libip6tc.pc
+	$(REWRITE_PKGCONF)/libiptc.pc
+	$(REWRITE_PKGCONF)/xtables.pc
 	$(REMOVE)/iptables-$(IPTABLES_VER)
 	$(TOUCH)
 
diff --git a/make/system-tools.mk b/make/system-tools.mk
index 9959bce9..f5eb55af 100644
--- a/make/system-tools.mk
+++ b/make/system-tools.mk
@@ -215,7 +215,7 @@ $(D)/parted: $(D)/e2fsprogs $(ARCHIVE)/parted-$(PARTED_VER).tar.xz | $(TARGET_DI
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_LIBTOOL)/libparted.la
 	$(REWRITE_LIBTOOL)/libparted-fs-resize.la
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libparted.pc
+	$(REWRITE_PKGCONF)/libparted.pc
 	$(REMOVE)/parted-$(PARTED_VER)
 	$(TOUCH)
 
@@ -537,7 +537,7 @@ $(D)/e2fsprogs: $(ARCHIVE)/e2fsprogs-$(E2FSPROGS_VER).tar.gz | $(TARGET_DIR)
 		$(MAKE) install DESTDIR=$(TARGET_DIR); \
 		cd lib/uuid/; \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/uuid.pc
+	$(REWRITE_PKGCONF)/uuid.pc
 	$(REMOVE)/e2fsprogs-$(E2FSPROGS_VER)
 	cd $(TARGET_DIR) && rm sbin/dumpe2fs sbin/logsave sbin/e2undo \
 		sbin/filefrag sbin/e2freefrag bin/chattr bin/lsattr bin/uuidgen