From 085ec19a21b5e6bde5dc300e725bca9a82e8c445 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Tue, 21 Aug 2018 10:03:26 -0500
Subject: Fix OSX SIP for libs

---
 java/src/hdf/overview.html |  2 +-
 java/test/junit.sh.in      | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/java/src/hdf/overview.html b/java/src/hdf/overview.html
index 52dabf7..edb1b76 100644
--- a/java/src/hdf/overview.html
+++ b/java/src/hdf/overview.html
@@ -12,7 +12,7 @@ of the unsupported functions have C function pointers, which is not currently
 implemented in JHI5.</p>
 
 <table style="width:71%;text-align:center;background-color:#dbeaf5" border="1">
-<caption>Java HD5 Interface (JHI5)</caption>
+<caption>Java HDF5 Interface (JHI5)</caption>
 <tr>
 <td style="text-align:center;">
 Note: The JHI5 does not support HDF4 or earlier.
diff --git a/java/test/junit.sh.in b/java/test/junit.sh.in
index 5d69bee..64d9f21 100644
--- a/java/test/junit.sh.in
+++ b/java/test/junit.sh.in
@@ -41,6 +41,7 @@ myos=`uname -s`
 # where the libs exist
 HDFLIB_HOME="$top_srcdir/java/lib"
 BLDLIBDIR="$top_builddir/hdf5/lib"
+BLDINSDIR="$top_builddir/../hdf5/lib"
 BLDDIR="."
 HDFTEST_HOME="$top_srcdir/java/test"
 JARFILE=jar@PACKAGE_TARNAME@-@PACKAGE_VERSION@.jar
@@ -125,9 +126,9 @@ COPY_LIBFILES_TO_BLDLIBDIR()
             # make cp fail
             SDIR=`$DIRNAME $tstfile`
             INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'`
-            INODE_DDIR=`$LS -i -d $BLDLIBDIR | $AWK -F' ' '{print $1}'`
+            INODE_DDIR=`$LS -i -d $BLDINSDIR | $AWK -F' ' '{print $1}'`
             if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
-                $CP -f $tstfile $BLDLIBDIR
+                $CP -f $tstfile $BLDINSDIR
                 if [ $? -ne 0 ]; then
                     echo "Error: FAILED to copy $tstfile ."
 
@@ -281,13 +282,8 @@ if $TEST -z "$LD_LIBRARY_PATH" ; then
 fi
 
 case  $os_name in
-    Darwin)
-    DYLD_LIBRARY_PATH=$BLDLIBDIR:$DYLD_LIBRARY_PATH
-    export DYLD_LIBRARY_PATH
-    LD_LIBRARY_PATH=$DYLD_LIBRARY_PATH
-    ;;
     *)
-    LD_LIBRARY_PATH=$BLDLIBDIR:$LD_LIBRARY_PATH
+    LD_LIBRARY_PATH=$BLDLIBDIR:$BLDINSDIR:$LD_LIBRARY_PATH
     ;;
 esac
 
-- 
cgit v0.12