[Libreoffice-commits] .: solenv/gbuild

[Peter Foley]

 solenv/gbuild/ExternalLib.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ec3d0b88ab7b8b7bfdfeec93ead2cb52c287c520
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Sat Oct 1 19:47:06 2011 -0400

    respect PKG_CONFIG_PATH

diff --git a/solenv/gbuild/ExternalLib.mk b/solenv/gbuild/ExternalLib.mk
index 07d45b6..1e2af7c 100644
--- a/solenv/gbuild/ExternalLib.mk
+++ b/solenv/gbuild/ExternalLib.mk
@@ -97,7 +97,7 @@ define gb_ExternalLib__command_autotools
 	mkdir -p $(call gb_ExternalLib_get_builddir,$(1)) && \
 	tar -x -C $(call gb_ExternalLib_get_builddir,$(1)) --strip-component=1 -f $< && \
 	pushd $(call gb_ExternalLib_get_builddir,$(1)) && for p in $(T_PATCHES) ; do patch -p 1 < $(gb_REPOS)/$$p || exit 1; done && \
-	CC="$(gb_CC)" CXX="$(gb_CXX)" CFLAGS="$(T_CFLAGS)" CXXFLAGS="$(T_CXXFLAGS)" PKG_CONFIG_PATH="$(OUTDIR)/lib/pkgconfig" ./configure --prefix=$(OUTDIR) $(T_CONF_ARGS) && \
+	CC="$(gb_CC)" CXX="$(gb_CXX)" CFLAGS="$(T_CFLAGS)" CXXFLAGS="$(T_CXXFLAGS)" PKG_CONFIG_PATH="$(PKG_CONFIG_PATH) $(OUTDIR)/lib/pkgconfig" ./configure --prefix=$(OUTDIR) $(T_CONF_ARGS) && \
 	for p in $(T_POST_PATCHES) ; do patch -p 1 < $(gb_REPOS)/$p || exit 1; done
 	#we don't want a deployed rpath pointing into our solver, to-do, set correct ORIGIN-foo ?
 	pushd $(call gb_ExternalLib_get_builddir,$(1)) && if test -e libtool ; then sed -i 's,^hardcode_libdir_flag_spec=.*,hardcode_libdir_flag_spec="",g' libtool && sed -i 's,^runpath_var=LD_RUN_PATH,runpath_var=DIE_RPATH_DIE,g' libtool; fi