summaryrefslogtreecommitdiffstats
path: root/hl
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2019-01-07 03:59:35 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2019-01-07 03:59:35 (GMT)
commit61d3403d12364b5446a47291dc8f9cba6b7c7d00 (patch)
tree71dd9c6f2b1e8d457a35367bcdb7e73908487cc3 /hl
parent619b0abfd66a07933803177d119aadfda7a9ee29 (diff)
downloadhdf5-61d3403d12364b5446a47291dc8f9cba6b7c7d00.zip
hdf5-61d3403d12364b5446a47291dc8f9cba6b7c7d00.tar.gz
hdf5-61d3403d12364b5446a47291dc8f9cba6b7c7d00.tar.bz2
Remove install-exec-hook from hl/fortran/Makefile.am.
Add check for existing links in hl/fortran/src/Makefile.am.
Diffstat (limited to 'hl')
-rw-r--r--hl/fortran/Makefile.am12
-rw-r--r--hl/fortran/src/Makefile.am6
2 files changed, 4 insertions, 14 deletions
diff --git a/hl/fortran/Makefile.am b/hl/fortran/Makefile.am
index 14456fe..ad18a21 100644
--- a/hl/fortran/Makefile.am
+++ b/hl/fortran/Makefile.am
@@ -26,18 +26,6 @@ include $(top_srcdir)/config/commence.am
SUBDIRS=src test
DIST_SUBDIRS=src test examples
-# 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;
-
# Install examples
install-examples uninstall-examples:
@(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
diff --git a/hl/fortran/src/Makefile.am b/hl/fortran/src/Makefile.am
index 200a2ce..37e074c 100644
--- a/hl/fortran/src/Makefile.am
+++ b/hl/fortran/src/Makefile.am
@@ -55,10 +55,12 @@ libhdf5hl_fortran_la_LIBADD=$(LIBH5_HL) $(LIBH5F)
# actual lib file.
install-exec-hook:
cd $(DESTDIR)$(libdir) && \
- if test -f libhdf5hl_fortran.a; then \
+ 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; then \
+ if test -f libhdf5hl_fortran.so -a \
+ ! -f libhdf5_hl_fortran.so; then \
$(LN_S) libhdf5hl_fortran.so libhdf5_hl_fortran.so; \
fi;