[Libreoffice-commits] core.git: external/libstaroffice

David Tardon dtardon at redhat.com
Sat Oct 28 18:36:49 UTC 2017


 external/libstaroffice/ExternalProject_libstaroffice.mk |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 18cacf522b873f7175470b0258fb1f73ad7dff7d
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Oct 28 16:18:08 2017 +0200

    run make in top-level dir
    
    Change-Id: Ic1629db12fa272aac20478a383c0d92e2f0312cf
    Reviewed-on: https://gerrit.libreoffice.org/44003
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/external/libstaroffice/ExternalProject_libstaroffice.mk b/external/libstaroffice/ExternalProject_libstaroffice.mk
index 8d77cb807968..28c4f47becd5 100644
--- a/external/libstaroffice/ExternalProject_libstaroffice.mk
+++ b/external/libstaroffice/ExternalProject_libstaroffice.mk
@@ -42,8 +42,7 @@ $(call gb_ExternalProject_get_state_target,libstaroffice,build) :
 					-Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN')) \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
-		&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
-			$(MAKE)) \
+		&& $(MAKE) \
 		$(if $(filter MACOSX,$(OS)),\
 			&& $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
 				$(EXTERNAL_WORKDIR)/src/lib/.libs/libstaroffice-0.0.0.dylib \


More information about the Libreoffice-commits mailing list