diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2019-01-04 13:26:15 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2019-01-04 13:26:15 (GMT) |
| commit | 30abf02de229e606f4ba05afa00ca313f51e7a1a (patch) | |
| tree | a8408e6d10c833ea9013a0def9f9587e1a2ec573 | |
| parent | 9ac12ce29956a4accbec2c15bef45e793fc466f8 (diff) | |
| download | hdf5-30abf02de229e606f4ba05afa00ca313f51e7a1a.zip hdf5-30abf02de229e606f4ba05afa00ca313f51e7a1a.tar.gz hdf5-30abf02de229e606f4ba05afa00ca313f51e7a1a.tar.bz2 | |
Add symlinks named libhdf5_hl_fortran* to libhdf5hl_fortran in
Makefile.am to match cmake install and the name pattern for other hl lib
files.
Add missing ';' to test/dsets.c line 13075.
| -rw-r--r-- | hl/fortran/src/Makefile.am | 13 | ||||
| -rw-r--r-- | test/dsets.c | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/hl/fortran/src/Makefile.am b/hl/fortran/src/Makefile.am index a495e220..a9beb20 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. diff --git a/test/dsets.c b/test/dsets.c index 2c012c7..544d0e2 100644 --- a/test/dsets.c +++ b/test/dsets.c @@ -13072,7 +13072,7 @@ test_object_header_minimization_dcpl(void) /*********/ if(NULL == h5_fixname(OHMIN_FILENAME_A, H5P_DEFAULT, filename, sizeof(filename))) - TEST_ERROR("unable to prepare filename") + TEST_ERROR("unable to prepare filename"); file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); if (0 > file_id) |