solenv/gbuild/ExternalLib.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 159e0dd6a0fee832fcb877f089284758f35e2552
Author: Miklos Vajna <vmik...@frugalware.org>
Date: Sun Oct 2 16:05:11 2011 +0200
ExternalLib.mk: avoid pushd when cd is enough
Reported-by: Julien Nabet <serval2...@yahoo.fr>
Acked-by: Norbert Thiebaud <nthieb...@gmail.com>
diff --git a/solenv/gbuild/ExternalLib.mk b/solenv/gbuild/ExternalLib.mk
index aeb6a6b..f25e79f 100644
--- a/solenv/gbuild/ExternalLib.mk
+++ b/solenv/gbuild/ExternalLib.mk
@@ -96,11 +96,11 @@ define gb_ExternalLib__command_autotools
rm -fr $(call gb_ExternalLib_get_workdir,$(1)) && \
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 && \
+ cd $(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="$(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
+ cd $(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
+MAKEFLAGS=$(filterout r,$(MAKEFLAGS)) $(MAKE) -C $(call
gb_ExternalLib_get_builddir,$(1))
+$(MAKE) -C $(call gb_ExternalLib_get_builddir,$(1)) install
endef
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
