diff options
author | Kurt Zenker <kz@openoffice.org> | 2008-05-06 09:42:56 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2008-05-06 09:42:56 +0000 |
commit | 9eeb129592cf38316f6d8f2cd09ad8b25d7e0107 (patch) | |
tree | b05e5c05386c4cf46b2b8e57afdce282ec10305a /javainstaller2 | |
parent | 2ad18373e182449c97474abeb576d2b5fb9597d0 (diff) |
INTEGRATION: CWS native147 (1.5.2); FILE MERGED
2008/04/21 13:02:19 is 1.5.2.1: #i88334# packages no longer relocatable
Diffstat (limited to 'javainstaller2')
-rwxr-xr-x | javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/SolarisInstaller.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/SolarisInstaller.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/SolarisInstaller.java index 4683d80e0c90..6835f985a282 100755 --- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/SolarisInstaller.java +++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/SolarisInstaller.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: SolarisInstaller.java,v $ - * $Revision: 1.5 $ + * $Revision: 1.6 $ * * This file is part of OpenOffice.org. * @@ -150,8 +150,7 @@ public class SolarisInstaller extends Installer { String log = "<br><b>Package: " + packageData.getName() + "</b>"; LogManager.addCommandsLogfileComment(log); - String installDir = data.getInstallDir(); - String rootDir = data.getInstallRoot(); + String rootDir = data.getInstallDir(); String packagePath = data.getPackagePath(); if (( packageData.getPkgSubdir() != null ) && ( ! packageData.getPkgSubdir().equals("") )) { @@ -249,8 +248,7 @@ public class SolarisInstaller extends Installer { String log = "<br><b>Package: " + packageData.getName() + "</b>"; LogManager.addCommandsLogfileComment(log); - String installDir = data.getInstallDir(); - String installRoot = data.getInstallRoot(); + String installRoot = data.getInstallDir(); String packageName = packageData.getPackageName(); String adminFileName = ""; |