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

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))

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