OpenBSD needs /usr/local/lib in SOLARLIB

75ccd5a3 · Robert Nagy · c857360d · 75ccd5a3
Kaydet (Commit) 75ccd5a3 authored Kas 04, 2010 tarafından Robert Nagy
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

set_soenv.in set_soenv.in +6 -2

No files found.
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1379,12 +1379,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;
   }