[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - external/libmwaw external/libodfgen external/librevenge external/libwps

[David Tardon]

 external/libmwaw/ExternalProject_libmwaw.mk       |    4 ++++
 external/libodfgen/ExternalProject_libodfgen.mk   |    4 ++++
 external/librevenge/ExternalProject_librevenge.mk |    4 ++++
 external/libwps/ExternalProject_libwps.mk         |    4 ++++
 4 files changed, 16 insertions(+)

New commits:
commit 0c4a1ecc7c46f67325bfb888a8db503abb4255b8
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Aug 4 09:27:24 2014 +0200

    fdo#82035 fix loader paths
    
    Change-Id: Ibecd7a89491b487bec54e8a86edbb1b133cdb8f0
    (cherry picked from commit 6cf40d263e33dd6934005af8319ae6fc8a386592)
    Reviewed-on: https://gerrit.libreoffice.org/10726
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/external/libmwaw/ExternalProject_libmwaw.mk b/external/libmwaw/ExternalProject_libmwaw.mk
index 1b51225..5a19d85 100644
--- a/external/libmwaw/ExternalProject_libmwaw.mk
+++ b/external/libmwaw/ExternalProject_libmwaw.mk
@@ -41,6 +41,10 @@ $(call gb_ExternalProject_get_state_target,libmwaw,build) :
 			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
 		&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
 			$(MAKE)) \
+		$(if $(filter MACOSX,$(OS)),\
+			&& $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
+				$(EXTERNAL_WORKDIR)/src/lib/.libs/libmwaw-0.3.3.dylib \
+		) \
 	)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libodfgen/ExternalProject_libodfgen.mk b/external/libodfgen/ExternalProject_libodfgen.mk
index f4e0072..54ff48b 100644
--- a/external/libodfgen/ExternalProject_libodfgen.mk
+++ b/external/libodfgen/ExternalProject_libodfgen.mk
@@ -36,6 +36,10 @@ $(call gb_ExternalProject_get_state_target,libodfgen,build) :
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
 		&& $(MAKE) \
+		$(if $(filter MACOSX,$(OS)),\
+			&& $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
+				$(EXTERNAL_WORKDIR)/src/.libs/libodfgen-0.1.1.dylib \
+		) \
 	)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/librevenge/ExternalProject_librevenge.mk b/external/librevenge/ExternalProject_librevenge.mk
index 1783993..707b16e 100644
--- a/external/librevenge/ExternalProject_librevenge.mk
+++ b/external/librevenge/ExternalProject_librevenge.mk
@@ -39,6 +39,10 @@ $(call gb_ExternalProject_get_state_target,librevenge,build) :
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
 		&& $(MAKE) \
+		$(if $(filter MACOSX,$(OS)),\
+			&& $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
+				$(EXTERNAL_WORKDIR)/src/lib/.libs/librevenge-0.0.0.dylib \
+		) \
 	)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libwps/ExternalProject_libwps.mk b/external/libwps/ExternalProject_libwps.mk
index 004c912..708b667 100644
--- a/external/libwps/ExternalProject_libwps.mk
+++ b/external/libwps/ExternalProject_libwps.mk
@@ -39,6 +39,10 @@ $(call gb_ExternalProject_get_state_target,libwps,build) :
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
 		&& $(MAKE) \
+		$(if $(filter MACOSX,$(OS)),\
+			&& $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
+				$(EXTERNAL_WORKDIR)/src/lib/.libs/libwps-0.3.3.dylib \
+		) \
 	)
 
 # vim: set noet sw=4 ts=4: