Add links to lib files from hl/fortran with names that match those of

the other hl libs;  e.g. libhdf5_hl_fortran.so -> libhdf5hl_fortran.so.
Fix for HDFFV-10596.

2 files changed, 34 insertions, 4 deletions

diff --git a/hl/fortran/src/Makefile.am b/hl/fortran/src/Makefile.am
index 3aef2c9..63ad7a1 100644
--- a/hl/fortran/src/Makefile.am
+++ b/hl/fortran/src/Makefile.am
@@ -50,6 +50,21 @@ 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 -a \
+            ! -f libhdf5_hl_fortran.a; then \
+                $(LN_S) libhdf5hl_fortran.a libhdf5_hl_fortran.a; \
+            fi; \
+            if test -f libhdf5hl_fortran.so -a \
+            ! -f libhdf5_hl_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.
diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in
index 3ff4e5e..6592854 100644
--- a/hl/fortran/src/Makefile.in
+++ b/hl/fortran/src/Makefile.in
@@ -1171,7 +1171,8 @@ install-dvi: install-dvi-am
 install-dvi-am:
 
 install-exec-am: install-libLTLIBRARIES
-
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 install-html: install-html-am
 
 install-html-am:
@@ -1213,7 +1214,7 @@ ps-am:
 
 uninstall-am: uninstall-libLTLIBRARIES uninstall-local
 
-.MAKE: check-am install-am install-strip
+.MAKE: check-am install-am install-exec-am install-strip
 
 .PHONY: CTAGS GTAGS TAGS all all-am all-local check check-TESTS \
 	check-am clean clean-generic clean-libLTLIBRARIES \
@@ -1222,8 +1223,8 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-local
 	distclean-libtool distclean-local distclean-tags distdir dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-data install-data-am install-data-local install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am \
+	install-dvi-am install-exec install-exec-am install-exec-hook \
+	install-html install-html-am install-info install-info-am \
 	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
 	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
@@ -1247,6 +1248,20 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-local
 help:
 	@$(top_srcdir)/bin/makehelp
 
+# 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 -a \
+            ! -f libhdf5_hl_fortran.a; then \
+                $(LN_S) libhdf5hl_fortran.a libhdf5_hl_fortran.a; \
+            fi; \
+            if test -f libhdf5hl_fortran.so -a \
+            ! -f libhdf5_hl_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.