[Libreoffice-commits] .: Branch 'libreoffice-3-4' - solenv/gbuild

Bjoern Michaelsen bmichaelsen at kemper.freedesktop.org
Mon Sep 19 14:06:56 PDT 2011


 solenv/gbuild/platform/macosx.mk |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit a87a8ee5a1919f6f6b4b35668456c03bdd499c85
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Sep 19 21:39:46 2011 +0200

    Call macosx-change-install-names on executables in gbuild, too.
    
    Signed-off-by: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 2def0c9..ff73333 100755
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -274,6 +274,8 @@ $(call gb_Helper_abbreviate_dirs,\
 		$(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \
 		-o $(1) \
 		`cat $${DYLIB_FILE}` && \
+	$(if $(filter Executable,$(TARGETTYPE)),\
+		$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Executable $(LAYER) $(1) &&) \
 	$(if $(filter Library CppunitTest,$(TARGETTYPE)),\
 		$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Library $(LAYER) $(1) && \
 		ln -sf $(1) $(patsubst %.dylib,%.jnilib,$(1)) &&) \


More information about the Libreoffice-commits mailing list