diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-09-23 12:18:08 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-09-23 12:18:08 +0200 |
| commit | a0f21d39d74a57d7cc7f98f1868d115e769b1c17 (patch) | |
| tree | 924da007bfc25af4adc6407ccb7b641a72d6d552 /solenv | |
| parent | 8df841735049936ae078d7d6da72257db43e8976 (diff) | |
linkoo seems to be unsupported on Mac OS X, make it exit with status 0 there (so ooinstall does not erroneously fail)
Diffstat (limited to 'solenv')
| -rwxr-xr-x | solenv/bin/linkoo | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo index 212cb568908e..fa2e0c64b995 100755 --- a/solenv/bin/linkoo +++ b/solenv/bin/linkoo @@ -56,6 +56,11 @@ export OOO_DISABLE_RECOVERY=1 export SAL_ALLOW_LINKOO_SYMLINKS=1 '; +if ($ENV{'OS'} eq 'MACOSX') { + print "FIXME: linkoo currently does not work on Mac OS X\n"; + exit(0); +} + my $dry_run = 0; my $usage = 0; my $LANG; @@ -70,12 +75,9 @@ my $ure_misc_dir = 'basis-link/ure-link/share/misc'; my $ure_java_dir = 'basis-link/ure-link/share/java'; my $ure_lib_dir = 'basis-link/ure-link/lib'; -$program_dir = 'openoffice.org/basis-link/MacOS' if ($ENV{OS} eq 'MACOSX'); # FIXME probably wrong - my @exceptions = ( 'cppuhelper', 'sunjavaplugin', 'libjvmfwk' ); my $dllre = '\.so$'; -$dllre = '\.dylib$' if ($ENV{OS} eq 'MACOSX'); my %replaceable = ( $program_dir => "($dllre|\\.rdb)", |