diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-05-11 10:30:25 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-05-11 10:30:25 +0000 |
| commit | 6364567c325272a4c5c36b693e8c2e6c57385ab9 (patch) | |
| tree | 6c6d79d3151f8d6813b472d2ed20f2ecdb674801 | |
| parent | 293072fd1647bd31d49fd2e3c60b94ac6edb94ee (diff) | |
INTEGRATION: CWS linuxppc02 (1.58.4); FILE MERGED
2005/05/03 20:13:44 ericb 1.58.4.1: i48011 with correct SOLARLIB libofficebean is correctly build
| -rw-r--r-- | config_office/set_soenv.in | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/config_office/set_soenv.in b/config_office/set_soenv.in index c0e3a3f48916..5b1e737d400d 100644 --- a/config_office/set_soenv.in +++ b/config_office/set_soenv.in @@ -1,8 +1,8 @@ #!@PERL@ -w # # Program: set_soenv.in -# Version: $Revision: 1.59 $ -# Date: $Date: 2005-05-10 07:52:29 $ +# Version: $Revision: 1.60 $ +# Date: $Date: 2005-05-11 11:30:25 $ # Author: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems, Ireland. # #--------------------------------------------------------------------------- @@ -412,9 +412,10 @@ elsif ( $platform =~ m/linux-gnu/ ) $CPUNAME = "POWERPC"; $DLLSUFFIX = "lp"; $OUTPATH = "unxlngppc"; - $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc"; - $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."classic"; - $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads"; +# j2sdk is IBMJava2-ppc-142 + $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."bin"; + $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."bin".$ds."classic"; + $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."bin"; } elsif ($platform =~ m/^s390/) { print "Setting Linux S/390 specific values... "; |