[Libreoffice-commits] .: RepositoryFixes.mk solenv/gbuild

[Stephan Bergmann]

 RepositoryFixes.mk               |    4 ++--
 solenv/gbuild/platform/macosx.mk |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit fa2006828ff69509e1ead755af906dcd35a992bf
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Jun 15 16:46:44 2012 +0200

    Fix pyuno.so name on Mac OS X
    
    ...which also needs a change to the logic that symlinks *.jnilib to *.dylib, as
    that would have symlinked pyuno.so onto itself (as it contains no .dylib).  (And
    while we are at that, anyway, also only store relative paths in the symlinks.)
    
    Change-Id: I6f3e9effc4d185df935795958cc84e60e862a424

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 45833b9..12108f3 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -44,8 +44,8 @@ gb_Library_FILENAMES := $(patsubst store:libuno_store%,store:libstore%,$(gb_Libr
 gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
 
 ifeq ($(OS),MACOSX)
-# libpyuno_wrapper.so => pyuno.dyn
-gb_Library_FILENAMES := $(patsubst pyuno_wrapper:libpyuno_wrapper.so,pyuno_wrapper:pyuno.dyn,$(gb_Library_FILENAMES))
+# libpyuno_wrapper.dylib => pyuno.so
+gb_Library_FILENAMES := $(patsubst pyuno_wrapper:libpyuno_wrapper.dylib,pyuno_wrapper:pyuno.so,$(gb_Library_FILENAMES))
 else
 # libpyuno_wrapper.so => pyuno.so
 gb_Library_FILENAMES := $(patsubst pyuno_wrapper:libpyuno_wrapper.so,pyuno_wrapper:pyuno.so,$(gb_Library_FILENAMES))
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 984ec6a..425c7d6 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -236,7 +236,7 @@ $(call gb_Helper_abbreviate_dirs,\
             $(LAYER) $(1) &&) \
 	$(if $(filter Library Bundle CppunitTest,$(TARGETTYPE)),\
 		$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Library $(LAYER) $(if $(SOVERSION),$(1).$(SOVERSION),$(1)) && \
-		ln -sf $(1) $(patsubst %.dylib,%.jnilib,$(1)) &&) \
+		ln -sf $(notdir $(1)) $(basename $(1)).jnilib &&) \
 	rm -f $${DYLIB_FILE})
 endef