diff --git a/scp2/source/ooo/directory_ooo_macosx.scp b/scp2/source/ooo/directory_ooo_macosx.scp index ee4ad7522938..ab1138d70c44 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 1554bbe56016..71a2f6737552 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) {