diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 12:37:38 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 12:37:38 +0000 |
| commit | ce8863f5a3e3ec8b5624abd3de292b136966ce4d (patch) | |
| tree | c3e5f93885a05db2ab82c6fc1ed9b9444fef1897 /solenv/bin | |
| parent | 2c88bb6cbb0e9448f9fc9beef596d81016f37315 (diff) | |
INTEGRATION: CWS sb91 (1.2.26); FILE MERGED
2008/07/24 08:53:13 sb 1.2.26.1: partially adapted for Mac OS X
Diffstat (limited to 'solenv/bin')
| -rwxr-xr-x | solenv/bin/installoffice.pl | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/solenv/bin/installoffice.pl b/solenv/bin/installoffice.pl index 3188b01ffc7c..a91e244bfcd9 100755 --- a/solenv/bin/installoffice.pl +++ b/solenv/bin/installoffice.pl @@ -11,7 +11,7 @@ eval 'exec perl -wS $0 ${1+"$@"}' # # $RCSfile: installoffice.pl,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # # This file is part of OpenOffice.org. # @@ -344,10 +344,8 @@ sub patchXCU(){ print_error("could not find $bootstrapini", "1") if ( !-e $bootstraprc ); print "bootstraprc: '$bootstraprc'\n" if $debug; -# my $pb = $PS."program".$PS.$bootstrapini; - my $pb = "/program/$bootstrapini"; - - $bootstraprc =~ /(.*)($pb)/; + $bootstraprc =~ /(.*)\/(program|MacOS)\/$bootstrapini/ + or print_error("could not determine basedir", 1); my $basedir = $1; |