diff options
| -rw-r--r-- | RepositoryFixes.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/platform/macosx.mk | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 45833b96639f..12108f3cfe90 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 984ec6a835d3..425c7d6fb094 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 |