[Libreoffice-commits] .: scp2/source solenv/bin

[Christian Lohmaier]

 scp2/source/ooo/directory_ooo_macosx.scp |    2 --
 solenv/bin/macosx-dylib-link-list.pl     |    1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 949cf4927b8fa87d5ee248ad3b4764c0a1e78279
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Mon Jun 6 18:34:10 2011 +0200

    allow to build with internal Python on Mac (Python built as framework)

diff --git a/scp2/source/ooo/directory_ooo_macosx.scp b/scp2/source/ooo/directory_ooo_macosx.scp
index ee4ad75..ab1138d 100644
--- a/scp2/source/ooo/directory_ooo_macosx.scp
+++ b/scp2/source/ooo/directory_ooo_macosx.scp
@@ -34,9 +34,7 @@ Directory gid_Dir_Bundle
     LangPackHostName = "%PRODUCTNAME Language Pack.app";
     PatchHostName = "%PRODUCTNAME Patch.app";
 End
-#endif
 
-#ifdef MACOSX
 Directory gid_Dir_Bundle_Contents
     ParentID = gid_Dir_Bundle;
     HostName = "Contents";
diff --git a/solenv/bin/macosx-dylib-link-list.pl b/solenv/bin/macosx-dylib-link-list.pl
index c69fe63..700329c 100644
--- a/solenv/bin/macosx-dylib-link-list.pl
+++ b/solenv/bin/macosx-dylib-link-list.pl
@@ -75,6 +75,7 @@ foreach $file (@todo)
         if (m'^\s*(@.+/([^/]+)) \(compatibility version \d+\.\d+\.\d+, current version \d+\.\d+\.\d+\)\n$')
         {
             my $full = $1;
+            next if ($full eq '@loader_path/OOoPython.framework/Versions/2.6/OOoPython');
             my $loc = locate($2);
             if (defined $loc)
             {