summaryrefslogtreecommitdiffstats
path: root/solenv
diff options
context:
space:
mode:
authorPeter Foley <pefoley2@verizon.net>2011-10-01 15:08:58 -0400
committerPeter Foley <pefoley2@verizon.net>2011-10-01 18:34:50 -0400
commitfb6a64d8fc6a93b52a10fad5516918fed9482f22 (patch)
tree9d89c246af76a9ae367401933dbeca9877c1ba92 /solenv
parentdon't use dmake ant.mk during beanshell build (diff)
downloadcore-fb6a64d8fc6a93b52a10fad5516918fed9482f22.tar.gz
core-fb6a64d8fc6a93b52a10fad5516918fed9482f22.zip
make libcmis build aginst internal cppunit
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/ExternalLib.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/gbuild/ExternalLib.mk b/solenv/gbuild/ExternalLib.mk
index 142968fb0ec7..07d45b617c05 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)" ./configure --prefix=$(OUTDIR) $(T_CONF_ARGS) && \
+ CC="$(gb_CC)" CXX="$(gb_CXX)" CFLAGS="$(T_CFLAGS)" CXXFLAGS="$(T_CXXFLAGS)" 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