---
set_soenv.in | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/set_soenv.in b/set_soenv.in
index 834bd34..79e79bd 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1369,12 +1369,16 @@ elsif ($platform =~
m/linux|netbsd|osf1|aix|freebsd|openbsd/)
{ $SOLARLIB = $L.$par_dir.$LIB.
$L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
$L.'$SOLARVER'.$ds.'$INPATH'.$LIB.
- $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
- $L.'$JAVA_HOME'.$LIB64.
+ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB;
+ if ($platform =~ m/openbsd/) {
+ $SOLARLIB .= $L.$USR_LOCAL.$LIB;
+ }
+ $SOLARLIB .= $L.'$JAVA_HOME'.$LIB64.
$L.$JRELIBDIR.
$L.$JRETOOLKITDIR.
$L.$JRETHREADDIR.
$L_STLPORT_LIB;
+
if ( $XLIB ne "/usr/lib" && $XLIB ne "/usr/lib64" ) {
$SOLARLIB .= $L.$XLIB;
}
--
1.7.3.1
_______________________________________________
LibreOffice mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
