diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2017-05-02 03:08:00 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2017-05-02 03:08:00 (GMT) |
| commit | 3b81a29c469f909858b6c135036ffa43a9f97534 (patch) | |
| tree | a367840b3feeb8ee1571079fa5480b3789dc7de4 /tools | |
| parent | fc4e8ea5ecc52d0df179ec26ec9bf001a60c1ca0 (diff) | |
| parent | be49a9422654ac9eec07ffe3599b4a7f7561cdb6 (diff) | |
| download | hdf5-3b81a29c469f909858b6c135036ffa43a9f97534.zip hdf5-3b81a29c469f909858b6c135036ffa43a9f97534.tar.gz hdf5-3b81a29c469f909858b6c135036ffa43a9f97534.tar.bz2 | |
Merge pull request #482 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit 'be49a9422654ac9eec07ffe3599b4a7f7561cdb6':
Comment out install-exec-hooks to remove libdynlib* files. Allen did the same for hdf5_1_10 and hdf5_1_10_1 because the hooks don't reliably work. In the develop branch they are causing make install failures because the autotools' install commands sometimes attempt to chmod these files when they no longer exist.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/test/h5diff/Makefile.am | 4 | ||||
| -rw-r--r-- | tools/test/h5dump/Makefile.am | 4 | ||||
| -rw-r--r-- | tools/test/h5ls/Makefile.am | 4 | ||||
| -rw-r--r-- | tools/test/h5repack/Makefile.am | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/tools/test/h5diff/Makefile.am b/tools/test/h5diff/Makefile.am index 922dddc..5721aaa 100644 --- a/tools/test/h5diff/Makefile.am +++ b/tools/test/h5diff/Makefile.am @@ -57,8 +57,8 @@ if HAVE_SHARED_CONDITIONAL libdynlibdiff.la: $(libdynlibdiff_la_OBJECTS) $(libdynlibdiff_la_DEPENDENCIES) $(EXTRA_libdynlibdiff_la_DEPENDENCIES) $(AM_V_CCLD)$(libdynlibdiff_la_LINK) $(am_libdynlibdiff_la_rpath) $(libdynlibdiff_la_OBJECTS) $(libdynlibdiff_la_LIBADD) -install-exec-hook: - $(RM) $(DESTDIR)$(dyndir)/*dynlib* +#install-exec-hook: +# $(RM) $(DESTDIR)$(dyndir)/*dynlib* endif # Temporary files. *.h5 are generated by h5diff. They should diff --git a/tools/test/h5dump/Makefile.am b/tools/test/h5dump/Makefile.am index 64d2d7c..df97396 100644 --- a/tools/test/h5dump/Makefile.am +++ b/tools/test/h5dump/Makefile.am @@ -46,8 +46,8 @@ if HAVE_SHARED_CONDITIONAL libdynlibdump.la: $(libdynlibdump_la_OBJECTS) $(libdynlibdump_la_DEPENDENCIES) $(EXTRA_libdynlibdump_la_DEPENDENCIES) $(AM_V_CCLD)$(libdynlibdump_la_LINK) $(am_libdynlibdump_la_rpath) $(libdynlibdump_la_OBJECTS) $(libdynlibdump_la_LIBADD) -install-exec-hook: - $(RM) $(DESTDIR)$(dyndir)/*dynlib* +#install-exec-hook: +# $(RM) $(DESTDIR)$(dyndir)/*dynlib* endif # Temporary files. *.h5 are generated by h5dumpgentest. They should diff --git a/tools/test/h5ls/Makefile.am b/tools/test/h5ls/Makefile.am index 9773ee5..8ace14d 100644 --- a/tools/test/h5ls/Makefile.am +++ b/tools/test/h5ls/Makefile.am @@ -43,8 +43,8 @@ if HAVE_SHARED_CONDITIONAL libdynlibls.la: $(libdynlibls_la_OBJECTS) $(libdynlibls_la_DEPENDENCIES) $(EXTRA_libdynlibls_la_DEPENDENCIES) $(AM_V_CCLD)$(libdynlibls_la_LINK) $(am_libdynlibls_la_rpath) $(libdynlibls_la_OBJECTS) $(libdynlibls_la_LIBADD) -install-exec-hook: - $(RM) $(DESTDIR)$(dyndir)/*dynlib* +#install-exec-hook: +# $(RM) $(DESTDIR)$(dyndir)/*dynlib* endif diff --git a/tools/test/h5repack/Makefile.am b/tools/test/h5repack/Makefile.am index b3cfc88..da2a3c3 100644 --- a/tools/test/h5repack/Makefile.am +++ b/tools/test/h5repack/Makefile.am @@ -56,8 +56,8 @@ libdynlibadd.la: $(libdynlibadd_la_OBJECTS) $(libdynlibadd_la_DEPENDENCIES) $(EX libdynlibvers.la: $(libdynlibvers_la_OBJECTS) $(libdynlibvers_la_DEPENDENCIES) $(EXTRA_libdynlibvers_la_DEPENDENCIES) $(AM_V_CCLD)$(libdynlibvers_la_LINK) $(am_libdynlibvers_la_rpath) $(libdynlibvers_la_OBJECTS) $(libdynlibvers_la_LIBADD) -install-exec-hook: - $(RM) $(DESTDIR)$(dyndir)/*dynlib* +#install-exec-hook: +# $(RM) $(DESTDIR)$(dyndir)/*dynlib* endif |