diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2011-10-02 16:05:11 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@frugalware.org> | 2011-10-02 16:05:54 +0200 |
| commit | 159e0dd6a0fee832fcb877f089284758f35e2552 (patch) | |
| tree | 6c6287b08e3e1975d67c2f552c7fe051579c52c2 /solenv | |
| parent | abb630be54f74e67d92be0ce038bbbadd31c4af8 (diff) | |
ExternalLib.mk: avoid pushd when cd is enough
Reported-by: Julien Nabet <serval2412@yahoo.fr>
Acked-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/ExternalLib.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/gbuild/ExternalLib.mk b/solenv/gbuild/ExternalLib.mk index aeb6a6b5178a..f25e79f226c3 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 |