diff options
| author | Joachim Lingner <jl@openoffice.org> | 2010-06-07 10:13:44 +0200 |
|---|---|---|
| committer | Joachim Lingner <jl@openoffice.org> | 2010-06-07 10:13:44 +0200 |
| commit | 0b12767776118542325ed6b220d30d3a1b51cae1 (patch) | |
| tree | 44ece782ab5971df4de72f2a0128ef5388742a31 /solenv/bin/modules/installer/systemactions.pm | |
| parent | 9170a5e1d600487f21eb54482c244fbf9590aedd (diff) | |
| parent | 0770b2664645eca8a6669bb134ab9a59349ff0b6 (diff) | |
jl152 merge with DEV300_m80
Diffstat (limited to 'solenv/bin/modules/installer/systemactions.pm')
| -rw-r--r-- | solenv/bin/modules/installer/systemactions.pm | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/solenv/bin/modules/installer/systemactions.pm b/solenv/bin/modules/installer/systemactions.pm index 4ec75f37ce02..981dc40f3209 100644 --- a/solenv/bin/modules/installer/systemactions.pm +++ b/solenv/bin/modules/installer/systemactions.pm @@ -321,6 +321,13 @@ sub create_directories else { $path = $installer::globals::unpackpath . $installer::globals::separator; + + # special handling, if LOCALINSTALLDIR is set + if (( $installer::globals::localinstalldirset ) && ( $newdirectory eq "install" )) + { + $installer::globals::localinstalldir =~ s/\Q$installer::globals::separator\E\s*$//; + $path = $installer::globals::localinstalldir . $installer::globals::separator; + } } $infoline = "create_directories: Using $path for $newdirectory !\n"; |