Merge pull request #1475 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10

* commit 'e61b3a7de95c23f4f24282bad41c5154643741a5':
  Merge pull request #1429 in HDFFV/hdf5 from HDFFV-10596-fortran-library-names-differ to develop

2 files changed, 22 insertions, 0 deletions

diff --git a/hl/fortran/src/Makefile.am b/hl/fortran/src/Makefile.am
index a495e220..200a2ce 100644
--- a/hl/fortran/src/Makefile.am
+++ b/hl/fortran/src/Makefile.am
@@ -50,6 +50,19 @@ libhdf5hl_fortran_la_SOURCES=H5DSfc.c H5LTfc.c H5IMfc.c H5IMcc.c H5TBfc.c \
 # HDF5 HL Fortran library depends on HDF5 Library.
 libhdf5hl_fortran_la_LIBADD=$(LIBH5_HL) $(LIBH5F)
 
+# The name of the lib file doesn't follow the same pattern as the other hl lib
+# files, namely libhdf5_hl_*.  Add a symlink with the compliant name to the
+# actual lib file.
+install-exec-hook:
+	cd $(DESTDIR)$(libdir) && \
+	    if test -f libhdf5hl_fortran.a; then \
+	        $(LN_S) libhdf5hl_fortran.a libhdf5_hl_fortran.a; \
+	    fi; \
+	    if test -f libhdf5hl_fortran.so; then \
+	        $(LN_S) libhdf5hl_fortran.so libhdf5_hl_fortran.so; \
+	    fi;
+
+
 # Fortran module files can have different extensions and different names
 # (e.g., different capitalizations) on different platforms.  Write rules
 # for them explicitly rather than trying to teach automake about them.
@@ -72,6 +85,7 @@ uninstall-local:
 	    set -x; $(RM) $(includedir)/*.$(F9XMODEXT);                 \
 	  fi;                                                           \
 	fi
+	$(RM) $(DESTDIR)$(libdir)/libhdf5_hl_fortran*
 
 # These are the helper programs we need to build.
 noinst_PROGRAMS = H5HL_buildiface
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 3d93b80..836d1a1 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -401,6 +401,14 @@ Bug Fixes since HDF5-1.10.3 release
 
     Fortran
     --------
+    - Added symbolic links libhdf5_hl_fortran.so to libhdf5hl_fortran.so and
+      libhdf5_hl_fortran.a to libhdf5hl_fortran.a in hdf5/lib directory for 
+      autotools installs.  These were added to match the name of the files 
+      installed by cmake and the general pattern of hl lib files.  We will 
+      change the names of the installed lib files to the matching name in 
+      the next major release.
+
+      (LRK - 2019/01/04, HDFFV-10596)
 
     - Made Fortran specific subroutines PRIVATE in generic procedures.