From 6d3873ba4b91337fede90b317ac2dcc9c476d110 Mon Sep 17 00:00:00 2001 From: Abdoulaye Walsimou Gaye Date: Sun, 26 Jun 2011 01:44:58 +0200 Subject: Build system: fix PKG_CONFIG_PATH for target and host Signed-off-by: Abdoulaye Walsimou Gaye --- packages/x11/compositeproto/compositeproto.mk | 2 +- packages/x11/damageproto/damageproto.mk | 2 +- packages/x11/fixesproto/fixesproto.mk | 2 +- packages/x11/fontsproto/fontsproto.mk | 2 +- packages/x11/inputproto/inputproto.mk | 2 +- packages/x11/kbproto/kbproto.mk | 2 +- packages/x11/randrproto/randrproto.mk | 2 +- packages/x11/recordproto/recordproto.mk | 2 +- packages/x11/renderproto/renderproto.mk | 2 +- packages/x11/resourceproto/resourceproto.mk | 2 +- packages/x11/utilmacros/utilmacros.mk | 2 +- packages/x11/videoproto/videoproto.mk | 2 +- packages/x11/xcbproto/xcbproto.mk | 2 +- packages/x11/xcmiscproto/xcmiscproto.mk | 2 +- packages/x11/xextproto/xextproto.mk | 2 +- packages/x11/xproto/xproto.mk | 2 +- packages/x11/xtrans/xtrans.mk | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) (limited to 'packages/x11') 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: -- cgit v1.2.3