diff options
author | Robert Nagy <robert@openbsd.org> | 2010-11-30 15:51:43 +0100 |
---|---|---|
committer | Robert Nagy <robert@openbsd.org> | 2010-11-30 15:53:58 +0100 |
commit | c893d43118285f7c193bd39cf57aa9300f0975c3 (patch) | |
tree | 0e6a0e7d2a461e459181fee9b3083a8fd0685dd4 /solenv | |
parent | 12fff8caa7f99a1aed58711df4dd483ca6169a12 (diff) |
fix the list of languages and remove the unused wanted function
Let's try our best to create a good list of langauges in a format
of lang1,lang2.
Also remove the wanted function which is not used since
the baab40f5646b63ff51e7cb9c5aaac873066d46fe commit.
Diffstat (limited to 'solenv')
-rwxr-xr-x | solenv/bin/ooinstall | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall index dfca65e2fc39..c20be417e047 100755 --- a/solenv/bin/ooinstall +++ b/solenv/bin/ooinstall @@ -14,18 +14,6 @@ use Cwd; $path = ''; $do_link = 0; -sub wanted { - my $path_to_unopkg="$path/program"; - if ( $^O =~ /darwin/i ) - { - $path_to_unopkg="$path/OpenOffice.org.app/Contents/MacOS"; - } - -f $_ - && /.*\.oxt$/ - && system ( "LD_LIBRARY_PATH='' $path_to_unopkg/unopkg add -v --shared $File::Find::name" ) - && die "Cannot install $_ extension!"; -} - ( $^O =~ /openbsd/i ) || ( $^O =~ /darwin/i ) || ( -f "/proc/meminfo" ) || die "The installer cannot work without javaldx running, which requires /proc to be mounted"; # Workaround for system Mozilla @@ -77,10 +65,8 @@ $ENV{DEFAULT_TO_ENGLISH_FOR_PACKING} = 1; $langs=$ENV{WITH_LANG}; $langs='en-US' if $langs eq ''; -$langs =~ s/\s+/,/g; -# FIXME: hack... we get a useless , at the end which makes it being e.g. zu# -# which breaks the build... -$langs =~ s/,'/'/; +my @larr = grep { $_ ne '' } split(/ /, $langs); +$langs = join (",", @larr); $destdir=''; if ( defined $ENV{OODESTDIR} && |