From 93638dfae86168e1f16f417349a140e496979cda Mon Sep 17 00:00:00 2001
From: Ingo Schmidt <is@openoffice.org>
Date: Fri, 21 May 2010 14:14:48 +0200
Subject: #i111450# localinstalldir with full installation set tree

---
 solenv/bin/modules/installer/systemactions.pm | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'solenv/bin/modules/installer/systemactions.pm')

diff --git a/solenv/bin/modules/installer/systemactions.pm b/solenv/bin/modules/installer/systemactions.pm
index bbc65d3c1f7a..df3b331b80d8 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";
-- 
cgit