diff options
Diffstat (limited to 'solenv/bin/ooinstall')
| -rwxr-xr-x | solenv/bin/ooinstall | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall index f1866c6c4062..bb4d07725bbb 100755 --- a/solenv/bin/ooinstall +++ b/solenv/bin/ooinstall @@ -12,6 +12,7 @@ use File::Path qw(mkpath); use Cwd; $path = ''; +$strip = ''; $do_link = 0; $is_windows = 0; my $tmp_dir; @@ -41,8 +42,10 @@ if ( $ENV{'SYSTEM_MOZILLA'} eq 'YES' ) { $ENV{'PYTHONPATH'} = "$ENV{'SRC_ROOT'}/instsetoo_native/$ENV{'INPATH'}/bin:$ENV{'SOLARVERSION'}/$ENV{'INPATH'}/lib:$ENV{'SOLARVERSION'}/$ENV{'INPATH'}/lib/python:$ENV{'SOLARVERSION'}/$ENV{'INPATH'}/lib/python/lib-dynload"; for $arg (@ARGV) { - if ($arg eq '-l') { + if ($arg eq '-l' || $arg eq '--link') { $do_link = 1; + } elsif ($arg eq '-s' || $arg eq '--strip') { + $strip = "-strip"; } elsif ($arg eq '-h' || $arg eq '--help') { $help = 1; } else { @@ -55,8 +58,9 @@ for $arg (@ARGV) { $help = 1 if $path eq ''; if ($help) { - print "ooinstall [-l] <prefix to install to>\n"; - print " -l - performs a linkoo on the installed source\n"; + print "ooinstall [-l] [-s] <prefix to install to>\n"; + print " -l/--link - performs a linkoo on the installed source\n"; + print " -s/--strip - strip the installed binaries\n"; exit 1; } @@ -101,12 +105,6 @@ if ( defined $ENV{DESTDIR} && $destdir = "-destdir \"$ENV{DESTDIR}\""; } -$strip=''; -if ( defined $ENV{DISABLE_STRIP} && - $ENV{DISABLE_STRIP} eq "TRUE" ) { - $strip = "-dontstrip"; -} - $msi=''; if ($is_windows) { $msi = "-msitemplate $ENV{SRC_ROOT}/instsetoo_native/$ENV{INPATH}/misc/openoffice/msi_templates " . |