summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile22
-rw-r--r--mk/macros.mk2
-rw-r--r--mk/pkgconfig.mk11
-rw-r--r--packages/compression/zlib/zlib.mk2
-rw-r--r--packages/misc/libelf/libelf.mk2
-rw-r--r--packages/system/upstart/upstart.mk2
-rw-r--r--packages/x11/compositeproto/compositeproto.mk2
-rw-r--r--packages/x11/damageproto/damageproto.mk2
-rw-r--r--packages/x11/fixesproto/fixesproto.mk2
-rw-r--r--packages/x11/fontsproto/fontsproto.mk2
-rw-r--r--packages/x11/inputproto/inputproto.mk2
-rw-r--r--packages/x11/kbproto/kbproto.mk2
-rw-r--r--packages/x11/randrproto/randrproto.mk2
-rw-r--r--packages/x11/recordproto/recordproto.mk2
-rw-r--r--packages/x11/renderproto/renderproto.mk2
-rw-r--r--packages/x11/resourceproto/resourceproto.mk2
-rw-r--r--packages/x11/utilmacros/utilmacros.mk2
-rw-r--r--packages/x11/videoproto/videoproto.mk2
-rw-r--r--packages/x11/xcbproto/xcbproto.mk2
-rw-r--r--packages/x11/xcmiscproto/xcmiscproto.mk2
-rw-r--r--packages/x11/xextproto/xextproto.mk2
-rw-r--r--packages/x11/xproto/xproto.mk2
-rw-r--r--packages/x11/xtrans/xtrans.mk2
23 files changed, 33 insertions, 42 deletions
diff --git a/Makefile b/Makefile
index ad6e83c..d51548e 100644
--- a/Makefile
+++ b/Makefile
@@ -81,34 +81,28 @@ All: $(EMBTK_BUILD)
xconfig: basic
ifeq ($(CONFIG_EMBTK_DOTCONFIG),y)
- $(Q)PKG_CONFIG_PATH=/lib/pkgconfig:/usr/lib/pkgconfig:/usr/local/lib/pkgconfig \
- make -f scripts/Makefile.build obj=scripts/kconfig xconfig
+ $(Q)make -f scripts/Makefile.build obj=scripts/kconfig xconfig
else
@if [ -e $(EMBTK_ROOT)/.config.old ]; then \
cp $(EMBTK_ROOT)/.config.old $(EMBTK_ROOT)/.config; \
- PKG_CONFIG_PATH=/lib/pkgconfig:/usr/lib/pkgconfig:/usr/local/lib/pkgconfig \
- make -f scripts/Makefile.build obj=scripts/kconfig xconfig; \
+ $(MAKE) -f scripts/Makefile.build obj=scripts/kconfig xconfig; \
else \
- PKG_CONFIG_PATH=/lib/pkgconfig:/usr/lib/pkgconfig:/usr/local/lib/pkgconfig \
- make -f scripts/Makefile.build obj=scripts/kconfig xconfig; \
+ $(MAKE) -f scripts/Makefile.build obj=scripts/kconfig xconfig; \
fi
endif
menuconfig: basic
- $(Q)PKG_CONFIG_PATH=/lib/pkgconfig:/usr/lib/pkgconfig:/usr/local/lib/pkgconfig \
- make -f scripts/Makefile.build obj=scripts/kconfig menuconfig
+ $(Q)$(MAKE) -f scripts/Makefile.build obj=scripts/kconfig menuconfig
randconfig: basic
- $(Q)PKG_CONFIG_PATH=/lib/pkgconfig:/usr/lib/pkgconfig:/usr/local/lib/pkgconfig \
- make -f scripts/Makefile.build obj=scripts/kconfig randconfig
+ $(Q)$(MAKE) -f scripts/Makefile.build obj=scripts/kconfig randconfig
basic:
- $(Q)PKG_CONFIG_PATH=/lib/pkgconfig:/usr/lib/pkgconfig:/usr/local/lib/pkgconfig \
- make -f scripts/Makefile.build obj=scripts/basic
+ $(Q)$(MAKE) -f scripts/Makefile.build obj=scripts/basic
clean: rmallpath
- $(Q)make -f scripts/Makefile.clean obj=scripts/kconfig
- $(Q)make -f scripts/Makefile.clean obj=scripts/basic
+ $(Q)$(MAKE) -f scripts/Makefile.clean obj=scripts/kconfig
+ $(Q)$(MAKE) -f scripts/Makefile.clean obj=scripts/basic
$(Q)rm -rf .config kbuild.log .fakeroot*
startbuild:
diff --git a/mk/macros.mk b/mk/macros.mk
index 77887dc..48f552d 100644
--- a/mk/macros.mk
+++ b/mk/macros.mk
@@ -244,7 +244,7 @@ define EMBTK_CONFIGURE_PKG
LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
CPPFLAGS="-I$(SYSROOT)/usr/include" \
PKG_CONFIG=$(PKGCONFIG_BIN) \
- PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
+ PKG_CONFIG_PATH=$(EMBTK_PKG_CONFIG_PATH) \
ac_cv_func_malloc_0_nonnull=yes \
ac_cv_func_realloc_0_nonnull=yes \
$($(1)_CONFIGURE_ENV) \
diff --git a/mk/pkgconfig.mk b/mk/pkgconfig.mk
index 248f511..498e900 100644
--- a/mk/pkgconfig.mk
+++ b/mk/pkgconfig.mk
@@ -32,13 +32,10 @@ PKGCONFIG_PACKAGE := pkg-config-$(PKGCONFIG_VERSION).tar.gz
PKGCONFIG_SRC_DIR := $(TOOLS_BUILD)/pkg-config-$(PKGCONFIG_VERSION)
PKGCONFIG_BUILD_DIR := $(TOOLS_BUILD)/pkg-config-$(PKGCONFIG_VERSION)
-PKGCONFIG_BIN := $(HOSTTOOLS)/usr/bin/pkg-config
-ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y)
-PKG_CONFIG_PATH := $(SYSROOT)/usr/lib32/pkgconfig
-else
-PKG_CONFIG_PATH := $(SYSROOT)/usr/lib/pkgconfig
-endif
-export PKGCONFIG_BIN
+PKGCONFIG_BIN := $(HOSTTOOLS)/usr/bin/pkg-config
+EMBTK_PKG_CONFIG_PATH := $(SYSROOT)/usr/$(LIBDIR)/pkgconfig
+
+export PKGCONFIG_BIN EMBTK_PKGCONFIGPATH
pkgconfig_install:
$(call EMBTK_INSTALL_HOSTPKG,PKGCONFIG)
diff --git a/packages/compression/zlib/zlib.mk b/packages/compression/zlib/zlib.mk
index 65f59ea..32080d4 100644
--- a/packages/compression/zlib/zlib.mk
+++ b/packages/compression/zlib/zlib.mk
@@ -80,7 +80,7 @@ $(ZLIB_BUILD_DIR)/.configured:
LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
CPPFLAGS="-I$(SYSROOT)/usr/include" \
PKG_CONFIG=$(PKGCONFIG_BIN) \
- PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
+ PKG_CONFIG_PATH=$(EMBTK_PKG_CONFIG_PATH) \
$(ZLIB_CONFIGURE_ENV) \
$(CONFIG_SHELL) $(ZLIB_SRC_DIR)/configure \
--libdir=/usr/$(LIBDIR) --prefix=/usr --sysconfdir=/etc \
diff --git a/packages/misc/libelf/libelf.mk b/packages/misc/libelf/libelf.mk
index dbe0a58..656abb2 100644
--- a/packages/misc/libelf/libelf.mk
+++ b/packages/misc/libelf/libelf.mk
@@ -88,7 +88,7 @@ $(LIBELF_BUILD_DIR)/.configured:
LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
CPPFLAGS="-I$(SYSROOT)/usr/include" \
PKG_CONFIG=$(PKGCONFIG_BIN) \
- PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
+ PKG_CONFIG_PATH=$(EMBTK_PKG_CONFIG_PATH) \
./configure --build=$(HOST_BUILD) \
--host=$(STRICT_GNU_TARGET) \
--target=$(STRICT_GNU_TARGET) \
diff --git a/packages/system/upstart/upstart.mk b/packages/system/upstart/upstart.mk
index 54c5b92..70b5460 100644
--- a/packages/system/upstart/upstart.mk
+++ b/packages/system/upstart/upstart.mk
@@ -88,7 +88,7 @@ $(UPSTART_BUILD_DIR)/.configured:
LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
CPPFLAGS="-I$(SYSROOT)/usr/include" \
PKG_CONFIG=$(PKGCONFIG_BIN) \
- PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
+ PKG_CONFIG_PATH=$(EMBTK_PKG_CONFIG_PATH) \
./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \
--target=$(STRICT_GNU_TARGET) --libdir=/usr/$(LIBDIR) --disable-rpath \
--prefix=/ --exec-prefix= --sysconfdir=/etc
diff --git a/packages/x11/compositeproto/compositeproto.mk b/packages/x11/compositeproto/compositeproto.mk
index 966de71..e06a255 100644
--- a/packages/x11/compositeproto/compositeproto.mk
+++ b/packages/x11/compositeproto/compositeproto.mk
@@ -78,7 +78,7 @@ $(COMPOSITEPROTO_BUILD_DIR)/.configured:
LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
CPPFLGAS="-I$(SYSROOT)/usr/include" \
PKG_CONFIG=$(PKGCONFIG_BIN) \
- PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
+ PKG_CONFIG_PATH=$(EMBTK_PKG_CONFIG_PATH) \
./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \
--target=$(STRICT_GNU_TARGET) --libdir=/usr/$(LIBDIR) --prefix=/usr \
--disable-malloc0returnsnull
diff --git a/packages/x11/damageproto/damageproto.mk b/packages/x11/damageproto/damageproto.mk
index 2e1c2b0..f5262b1 100644
--- a/packages/x11/damageproto/damageproto.mk
+++ b/packages/x11/damageproto/damageproto.mk
@@ -77,7 +77,7 @@ $(DAMAGEPROTO_BUILD_DIR)/.configured:
LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
CPPFLGAS="-I$(SYSROOT)/usr/include" \
PKG_CONFIG=$(PKGCONFIG_BIN) \
- PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
+ PKG_CONFIG_PATH=$(EMBTK_PKG_CONFIG_PATH) \
./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \
--target=$(STRICT_GNU_TARGET) --prefix=/usr --libdir=/usr/$(LIBDIR) \
--disable-malloc0returnsnull
diff --git a/packages/x11/fixesproto/fixesproto.mk b/packages/x11/fixesproto/fixesproto.mk
index 5031540..9585cfd 100644
--- a/packages/x11/fixesproto/fixesproto.mk
+++ b/packages/x11/fixesproto/fixesproto.mk
@@ -77,7 +77,7 @@ $(FIXESPROTO_BUILD_DIR)/.configured:
LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
CPPFLGAS="-I$(SYSROOT)/usr/include" \
PKG_CONFIG=$(PKGCONFIG_BIN) \
- PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
+ PKG_CONFIG_PATH=$(EMBTK_PKG_CONFIG_PATH) \
./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \
--target=$(STRICT_GNU_TARGET) --prefix=/usr --libdir=/usr/$(LIBDIR) \
--disable-malloc0returnsnull
diff --git a/packages/x11/fontsproto/fontsproto.mk b/packages/x11/fontsproto/fontsproto.mk
index 27103d0..7c03d1d 100644
--- a/packages/x11/fontsproto/fontsproto.mk
+++ b/packages/x11/fontsproto/fontsproto.mk
@@ -79,7 +79,7 @@ $(FONTSPROTO_BUILD_DIR)/.configured:
LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
CPPFLGAS="-I$(SYSROOT)/usr/include" \
PKG_CONFIG=$(PKGCONFIG_BIN) \
- PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
+ PKG_CONFIG_PATH=$(EMBTK_PKG_CONFIG_PATH) \
./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \
--target=$(STRICT_GNU_TARGET) --prefix=/usr --libdir=/usr/$(LIBDIR) \
--disable-malloc0returnsnull
diff --git a/packages/x11/inputproto/inputproto.mk b/packages/x11/inputproto/inputproto.mk
index 8645320..5169668 100644
--- a/packages/x11/inputproto/inputproto.mk
+++ b/packages/x11/inputproto/inputproto.mk
@@ -78,7 +78,7 @@ $(INPUTPROTO_BUILD_DIR)/.configured:
LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
CPPFLGAS="-I$(SYSROOT)/usr/include" \
PKG_CONFIG=$(PKGCONFIG_BIN) \
- PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
+ PKG_CONFIG_PATH=$(EMBTK_PKG_CONFIG_PATH) \
./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \
--target=$(STRICT_GNU_TARGET) --prefix=/usr --libdir=/usr/$(LIBDIR) \
--disable-malloc0returnsnull
diff --git a/packages/x11/kbproto/kbproto.mk b/packages/x11/kbproto/kbproto.mk
index bc1db33..2837cdb 100644
--- a/packages/x11/kbproto/kbproto.mk
+++ b/packages/x11/kbproto/kbproto.mk
@@ -79,7 +79,7 @@ $(KBPROTO_BUILD_DIR)/.configured:
LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
CPPFLGAS="-I$(SYSROOT)/usr/include" \
PKG_CONFIG=$(PKGCONFIG_BIN) \
- PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
+ PKG_CONFIG_PATH=$(EMBTK_PKG_CONFIG_PATH) \
./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \
--target=$(STRICT_GNU_TARGET) --prefix=/usr --libdir=/usr/$(LIBDIR) \
--disable-malloc0returnsnull
diff --git a/packages/x11/randrproto/randrproto.mk b/packages/x11/randrproto/randrproto.mk
index 4d3d641..69236e4 100644
--- a/packages/x11/randrproto/randrproto.mk
+++ b/packages/x11/randrproto/randrproto.mk
@@ -77,7 +77,7 @@ $(RANDRPROTO_BUILD_DIR)/.configured:
LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
CPPFLGAS="-I$(SYSROOT)/usr/include" \
PKG_CONFIG=$(PKGCONFIG_BIN) \
- PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
+ PKG_CONFIG_PATH=$(EMBTK_PKG_CONFIG_PATH) \
./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \
--target=$(STRICT_GNU_TARGET) --prefix=/usr --libdir=/usr/$(LIBDIR) \
--disable-malloc0returnsnull
diff --git a/packages/x11/recordproto/recordproto.mk b/packages/x11/recordproto/recordproto.mk
index 9a93fe6..8980874 100644
--- a/packages/x11/recordproto/recordproto.mk
+++ b/packages/x11/recordproto/recordproto.mk
@@ -78,7 +78,7 @@ $(RECORDPROTO_BUILD_DIR)/.configured:
LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
CPPFLGAS="-I$(SYSROOT)/usr/include" \
PKG_CONFIG=$(PKGCONFIG_BIN) \
- PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
+ PKG_CONFIG_PATH=$(EMBTK_PKG_CONFIG_PATH) \
./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \
--target=$(STRICT_GNU_TARGET) --prefix=/usr --libdir=/usr/$(LIBDIR)
@touch $@
diff --git a/packages/x11/renderproto/renderproto.mk b/packages/x11/renderproto/renderproto.mk
index 8f154e9..de78c97 100644
--- a/packages/x11/renderproto/renderproto.mk
+++ b/packages/x11/renderproto/renderproto.mk
@@ -77,7 +77,7 @@ $(RENDERPROTO_BUILD_DIR)/.configured:
LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
CPPFLGAS="-I$(SYSROOT)/usr/include" \
PKG_CONFIG=$(PKGCONFIG_BIN) \
- PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
+ PKG_CONFIG_PATH=$(EMBTK_PKG_CONFIG_PATH) \
./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \
--target=$(STRICT_GNU_TARGET) --prefix=/usr --libdir=/usr/$(LIBDIR) \
--disable-malloc0returnsnull
diff --git a/packages/x11/resourceproto/resourceproto.mk b/packages/x11/resourceproto/resourceproto.mk
index 2a3b8a3..31fca81 100644
--- a/packages/x11/resourceproto/resourceproto.mk
+++ b/packages/x11/resourceproto/resourceproto.mk
@@ -77,7 +77,7 @@ $(RESOURCEPROTO_BUILD_DIR)/.configured:
LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
CPPFLGAS="-I$(SYSROOT)/usr/include" \
PKG_CONFIG=$(PKGCONFIG_BIN) \
- PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
+ PKG_CONFIG_PATH=$(EMBTK_PKG_CONFIG_PATH) \
./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \
--target=$(STRICT_GNU_TARGET) --libdir=/usr/$(LIBDIR) --prefix=/usr \
--disable-malloc0returnsnull
diff --git a/packages/x11/utilmacros/utilmacros.mk b/packages/x11/utilmacros/utilmacros.mk
index b783abc..a04975a 100644
--- a/packages/x11/utilmacros/utilmacros.mk
+++ b/packages/x11/utilmacros/utilmacros.mk
@@ -42,7 +42,7 @@ UTILMACROS_CONFIGURE_OPTS := --disable-malloc0returnsnull
utilmacros_install:
$(call EMBTK_INSTALL_PKG,UTILMACROS) && \
- cp $(SYSROOT)/usr/share/pkgconfig/xorg-macros.pc $(PKG_CONFIG_PATH) \
+ cp $(SYSROOT)/usr/share/pkgconfig/xorg-macros.pc $(EMBTK_PKG_CONFIG_PATH) \
&& $(MAKE) pkgconfig_files_adapt
download_utilmacros:
diff --git a/packages/x11/videoproto/videoproto.mk b/packages/x11/videoproto/videoproto.mk
index 83cdab2..358b611 100644
--- a/packages/x11/videoproto/videoproto.mk
+++ b/packages/x11/videoproto/videoproto.mk
@@ -79,7 +79,7 @@ $(VIDEOPROTO_BUILD_DIR)/.configured:
LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
CPPFLGAS="-I$(SYSROOT)/usr/include" \
PKG_CONFIG=$(PKGCONFIG_BIN) \
- PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
+ PKG_CONFIG_PATH=$(EMBTK_PKG_CONFIG_PATH) \
./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \
--target=$(STRICT_GNU_TARGET) --libdir=/usr/$(LIBDIR) --prefix=/usr \
--disable-malloc0returnsnull
diff --git a/packages/x11/xcbproto/xcbproto.mk b/packages/x11/xcbproto/xcbproto.mk
index 7170e33..cc08f1d 100644
--- a/packages/x11/xcbproto/xcbproto.mk
+++ b/packages/x11/xcbproto/xcbproto.mk
@@ -76,7 +76,7 @@ $(XCBPROTO_BUILD_DIR)/.configured:
LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
CPPFLGAS="-I$(SYSROOT)/usr/include" \
PKG_CONFIG=$(PKGCONFIG_BIN) \
- PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
+ PKG_CONFIG_PATH=$(EMBTK_PKG_CONFIG_PATH) \
./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \
--target=$(STRICT_GNU_TARGET) \
--prefix=/usr --libdir=/usr/$(LIBDIR)
diff --git a/packages/x11/xcmiscproto/xcmiscproto.mk b/packages/x11/xcmiscproto/xcmiscproto.mk
index 557882d..ab6012c 100644
--- a/packages/x11/xcmiscproto/xcmiscproto.mk
+++ b/packages/x11/xcmiscproto/xcmiscproto.mk
@@ -77,7 +77,7 @@ $(XCMISCPROTO_BUILD_DIR)/.configured:
LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
CPPFLGAS="-I$(SYSROOT)/usr/include" \
PKG_CONFIG=$(PKGCONFIG_BIN) \
- PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
+ PKG_CONFIG_PATH=$(EMBTK_PKG_CONFIG_PATH) \
./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \
--target=$(STRICT_GNU_TARGET) --prefix=/usr --libdir=/usr/$(LIBDIR) \
--disable-malloc0returnsnull
diff --git a/packages/x11/xextproto/xextproto.mk b/packages/x11/xextproto/xextproto.mk
index 6990e39..e451348 100644
--- a/packages/x11/xextproto/xextproto.mk
+++ b/packages/x11/xextproto/xextproto.mk
@@ -91,7 +91,7 @@ $(XEXTPROTO_BUILD_DIR)/.configured:
LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
CPPFLGAS="-I$(SYSROOT)/usr/include" \
PKG_CONFIG=$(PKGCONFIG_BIN) \
- PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
+ PKG_CONFIG_PATH=$(EMBTK_PKG_CONFIG_PATH) \
./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \
--target=$(STRICT_GNU_TARGET) --prefix=/usr --libdir=/usr/$(LIBDIR) \
--disable-malloc0returnsnull
diff --git a/packages/x11/xproto/xproto.mk b/packages/x11/xproto/xproto.mk
index 666b6b1..0272ca6 100644
--- a/packages/x11/xproto/xproto.mk
+++ b/packages/x11/xproto/xproto.mk
@@ -80,7 +80,7 @@ $(XPROTO_BUILD_DIR)/.configured:
LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
CPPFLGAS="-I$(SYSROOT)/usr/include" \
PKG_CONFIG=$(PKGCONFIG_BIN) \
- PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
+ PKG_CONFIG_PATH=$(EMBTK_PKG_CONFIG_PATH) \
./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \
--target=$(STRICT_GNU_TARGET) --prefix=/usr --libdir=/usr/$(LIBDIR) \
--disable-malloc0returnsnull
diff --git a/packages/x11/xtrans/xtrans.mk b/packages/x11/xtrans/xtrans.mk
index 32f4986..373b9c1 100644
--- a/packages/x11/xtrans/xtrans.mk
+++ b/packages/x11/xtrans/xtrans.mk
@@ -42,7 +42,7 @@ XTRANS_CONFIGURE_OPTS := --disable-malloc0returnsnull
xtrans_install:
$(call EMBTK_INSTALL_PKG,XTRANS) && \
- cp $(SYSROOT)/usr/share/pkgconfig/xtrans.pc $(PKG_CONFIG_PATH) \
+ cp $(SYSROOT)/usr/share/pkgconfig/xtrans.pc $(EMBTK_PKG_CONFIG_PATH) \
&& $(MAKE) pkgconfig_files_adapt
download_xtrans: