diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-13 11:30:46 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-13 11:30:46 +0000 |
| commit | e893cc21378f03c7d406a423f89ee2c6a65d8085 (patch) | |
| tree | fa46dfdf9309161d315a52474d3d540b96de09d8 /solenv/bin/modules/installer/parameter.pm | |
| parent | 873c9f788ae5f10b02f3293be3e1011561a58fc8 (diff) | |
INTEGRATION: CWS qadev32 (1.46.60); FILE MERGED
2008/05/14 07:21:10 cn 1.46.60.3: RESYNC: (1.47-1.48); FILE MERGED
2008/04/17 11:29:56 cn 1.46.60.2: RESYNC: (1.46-1.47); FILE MERGED
2008/03/05 16:36:27 cn 1.46.60.1: #i86692# add global variable LOCALUNPACDIR
Diffstat (limited to 'solenv/bin/modules/installer/parameter.pm')
| -rw-r--r-- | solenv/bin/modules/installer/parameter.pm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm index 1b615cc7c063..ab3f293de2a9 100644 --- a/solenv/bin/modules/installer/parameter.pm +++ b/solenv/bin/modules/installer/parameter.pm @@ -8,7 +8,7 @@ # # $RCSfile: parameter.pm,v $ # -# $Revision: 1.49 $ +# $Revision: 1.50 $ # # This file is part of OpenOffice.org. # @@ -368,6 +368,8 @@ sub setglobalvariables if ( $installer::globals::iswin ) { $installer::globals::unpackpath =~ s/\//\\/g; } } + if ( $installer::globals::localunpackdir ne "" ) { $installer::globals::unpackpath = $installer::globals::localunpackdir; } + if (!($installer::globals::unpackpath eq "")) { make_path_absolute(\$installer::globals::unpackpath); |