[Libreoffice-commits] core.git: solenv/bin ure/Package_install.mk

Stephan Bergmann sbergman at redhat.com
Tue Sep 16 14:03:08 PDT 2014


 solenv/bin/macosx-change-install-names.pl |    2 +-
 ure/Package_install.mk                    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 37991ef9d285c7ae0aa8c797fb7350494f6a1c06
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Sep 16 23:02:40 2014 +0200

    urelibs is part of the stable extension interface on Mac OS X
    
    Change-Id: Id1f089b9306124e43a4e44cdd2efccb5f60761d5

diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl
index c2dc416..0322872 100644
--- a/solenv/bin/macosx-change-install-names.pl
+++ b/solenv/bin/macosx-change-install-names.pl
@@ -56,7 +56,7 @@ sub action($$$)
          'shl/URELIB/URELIB' => '@loader_path',
          'shl/OOO/URELIB' => '@loader_path',
          'shl/OOO/OOO' => '@loader_path',
-         'shl/OXT/URELIB' => '@executable_path/../Frameworks',
+         'shl/OXT/URELIB' => '@executable_path/urelibs',
          'shl/NONE/URELIB' => '@__VIA_LIBRARY_PATH__',
          'shl/NONE/OOO' => '@__VIA_LIBRARY_PATH__',
          'shl/NONE/NONE' => '@loader_path');
diff --git a/ure/Package_install.mk b/ure/Package_install.mk
index 16acfed..13106f1 100644
--- a/ure/Package_install.mk
+++ b/ure/Package_install.mk
@@ -15,7 +15,7 @@ $(eval $(call gb_Package_add_symbolic_link,ure_install,$(LIBO_URE_BIN_FOLDER)/un
 endif
 
 ifeq (MACOSX,$(OS))
-# nothing
+$(eval $(call gb_Package_add_symbolic_link,ure_install,MacOS/urelibs,../Frameworks))
 else ifeq (WNT,$(OS))
 $(eval $(call gb_Package_add_file,ure_install,ure-link,ure-link))
 else


More information about the Libreoffice-commits mailing list