diff options
| author | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2010-12-07 21:52:15 +0100 |
|---|---|---|
| committer | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2010-12-08 00:32:25 +0100 |
| commit | 9bd58d2220d4fe8107e5e9bbb38188abe548850a (patch) | |
| tree | bc9a8c17d256806df441ec92e0fcbb9fd18ae423 /solenv/bin/linkoo | |
| parent | 438bff402f3246711b9ddce6fe4c25e13e716f33 (diff) | |
linkoo: link the URE libs and jars as well
Diffstat (limited to 'solenv/bin/linkoo')
| -rwxr-xr-x | solenv/bin/linkoo | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo index c6929e6fc297..e642b48aba60 100755 --- a/solenv/bin/linkoo +++ b/solenv/bin/linkoo @@ -54,6 +54,8 @@ export SAL_ALLOW_LINKOO_SYMLINKS=1 $program_dir = 'basis-link/program'; $brand_program_dir = 'program'; $ure_misc_dir = 'basis-link/ure-link/share/misc'; +$ure_java_dir = 'basis-link/ure-link/share/java'; +$ure_lib_dir = 'basis-link/ure-link/lib'; $program_dir = 'openoffice.org/basis-link/MacOS' if ($ENV{OS} eq 'MACOSX'); # FIXME probably wrong @@ -61,6 +63,8 @@ my @exceptions = ( 'cppuhelper', 'sunjavaplugin', 'libjvmfwk' ); %replaceable = ( $program_dir => '\.so', + $ure_lib_dir => '\.so', + $ure_java_dir => '\.jar$', $program_dir . '/resource' => '\.res$', $program_dir . '/classes' => '\.jar$', 'basis-link/share/config' => '\.zip$', @@ -69,6 +73,7 @@ my @exceptions = ( 'cppuhelper', 'sunjavaplugin', 'libjvmfwk' ); # strangely enough, OSX has those small differences... $replaceable{$program_dir} = '\.dylib$' if ($ENV{OS} eq 'MACOSX'); +$replaceable{$ure_lib_dir_dir} = '\.dylib$' if ($ENV{OS} eq 'MACOSX'); @search_dirs = ( 'lib', 'bin', 'class' ); |