diff options
| author | Michael Stahl <mst@openoffice.org> | 2011-03-28 10:34:17 +0000 |
|---|---|---|
| committer | Michael Stahl <mst@openoffice.org> | 2011-03-28 10:34:17 +0000 |
| commit | 4bd9ea1f76ab7af76c450379711596f5e0ad6636 (patch) | |
| tree | 710c2a4465d239e1709e47033447a1ae8778b1e8 /set_soenv.in | |
| parent | ef9a068d328937f7ed18828d9cd2ce76641f6c98 (diff) | |
solaris11: set_soenv.in: fix Solaris JDK include path:
Solaris 11 has JDK with no libmawt.so in motif21 directory, so breaks in bean;
the libmawt.so in headless does not work, so use the xawt directory instead.
xawt/libmawt.so seems to exist in JDKs since 1.5.0.
Diffstat (limited to 'set_soenv.in')
| -rw-r--r-- | set_soenv.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/set_soenv.in b/set_soenv.in index 793951eb8a4c..3cab161638d5 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -214,7 +214,7 @@ if ( $platform =~ m/solaris/ ) $CPU = "I"; $CPUNAME = "INTEL"; $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386"; - $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."motif21"; + $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt"; $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads"; } @@ -230,7 +230,7 @@ if ( $platform =~ m/solaris/ ) $CPU = "S"; $CPUNAME = "SPARC"; $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc"; - $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."motif21"; + $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."xawt"; $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."native_threads"; } |