diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-03-08 12:59:14 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-03-08 12:59:14 +0000 |
| commit | 2bcbd54ecc592232a92a589792e380235d41ede1 (patch) | |
| tree | a07a19176856bbe412928382c7a5e0a4821fcce1 /solenv/bin/linkoo | |
| parent | INTEGRATION: CWS ause048 (1.145.84); FILE MERGED (diff) | |
| download | core-2bcbd54ecc592232a92a589792e380235d41ede1.tar.gz core-2bcbd54ecc592232a92a589792e380235d41ede1.zip | |
INTEGRATION: CWS ause048 (1.11.24); FILE MERGED
2006/02/06 15:03:08 hjs 1.11.24.1: #i61266# DLLSUFFIX is obsolete. use DLLPOSTFIX instead
Diffstat (limited to 'solenv/bin/linkoo')
| -rwxr-xr-x | solenv/bin/linkoo | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo index 0c37e1d4b8e8..9d8cdf775dc5 100755 --- a/solenv/bin/linkoo +++ b/solenv/bin/linkoo @@ -14,9 +14,9 @@ # # $RCSfile: linkoo,v $ # -# $Revision: 1.11 $ +# $Revision: 1.12 $ # -# last change: $Author: obo $ $Date: 2006-01-19 16:16:16 $ +# last change: $Author: rt $ $Date: 2006-03-08 13:59:14 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -76,7 +76,7 @@ sub sniff_target($) { my $build_dir = shift; my ($dirhandle, $fname); - my ($target, $libver, $lang, $dllsuffix) = ( 'unxlngi4.pro', '680', 'en-US', 'li' ); # defaults + my ($target, $libver, $lang) = ( 'unxlngi4.pro', '680', 'en-US' ); # defaults opendir ($dirhandle, $build_dir) || die "Can't open $build_dir"; while ($fname = readdir ($dirhandle)) { @@ -92,18 +92,15 @@ sub sniff_target($) if ($1 eq 'UPD') { $libver = $2; } - if ($1 eq 'DLLSUFFIX') { - $dllsuffix = $2; - } } close ($file); } closedir ($dirhandle); - print "Sniffed target: $target, $libver, $dllsuffix\n"; + print "Sniffed target: $target, $libver\n"; - return ($target, $libver, $lang, $dllsuffix); + return ($target, $libver, $lang); } sub build_installed_list($) @@ -344,7 +341,7 @@ substr ($OOO_BUILD, 0, 1) eq '/' || die "linkoo requires absolute paths"; -d $OOO_BUILD || die "No such directory $OOO_BUILD"; -d "$OOO_INSTALL/program/resource" || die "$OOO_INSTALL doesn't look like an OO install"; -($TARGET, $LIBVER, $LANG, $DLLSUFFIX) = sniff_target ($OOO_BUILD); +($TARGET, $LIBVER, $LANG) = sniff_target ($OOO_BUILD); evilness ('undo'); |