diff options
| author | David Tardon <dtardon@redhat.com> | 2014-08-04 09:27:24 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-08-04 13:00:16 +0000 |
| commit | 0c4a1ecc7c46f67325bfb888a8db503abb4255b8 (patch) | |
| tree | 061e77bcb88f5dac6c008590a2d6d9ccf6e94fc4 | |
| parent | 6ce5eaf63f2bcc3f61abd20bbf84751c3ba4741e (diff) | |
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@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | external/libmwaw/ExternalProject_libmwaw.mk | 4 | ||||
| -rw-r--r-- | external/libodfgen/ExternalProject_libodfgen.mk | 4 | ||||
| -rw-r--r-- | external/librevenge/ExternalProject_librevenge.mk | 4 | ||||
| -rw-r--r-- | external/libwps/ExternalProject_libwps.mk | 4 |
4 files changed, 16 insertions, 0 deletions
diff --git a/external/libmwaw/ExternalProject_libmwaw.mk b/external/libmwaw/ExternalProject_libmwaw.mk index 1b51225f9959..5a19d8587738 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 f4e007206897..54ff48b8a7e0 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 1783993afce8..707b16efd6b1 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 004c91287305..708b667ab781 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: |