diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2013-04-01 22:52:23 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2013-04-01 22:52:23 (GMT) |
| commit | 8b04aa4c87fe7657d1a1dad62c2a95ab19e41083 (patch) | |
| tree | 9dd83064f45fbdad158a8ee364890ae0fcdccfef /test | |
| parent | 95332ad1770877b3b4558eb91a2dae4a0dd5aab1 (diff) | |
| download | hdf5-8b04aa4c87fe7657d1a1dad62c2a95ab19e41083.zip hdf5-8b04aa4c87fe7657d1a1dad62c2a95ab19e41083.tar.gz hdf5-8b04aa4c87fe7657d1a1dad62c2a95ab19e41083.tar.bz2 | |
[svn-r23512] Replace install-data-local with install-exec-hook in test/Makefile.am.
Change fixes order of chmod and rm for *dynlib* with parallel make.
Tested in trunk.
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.am | 2 | ||||
| -rw-r--r-- | test/Makefile.in | 15 |
2 files changed, 9 insertions, 8 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 9f7fc9e..74f72d2 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -85,7 +85,7 @@ if HAVE_SHARED_CONDITIONAL libdynlib1_la_SOURCES=dynlib1.c libdynlib2_la_SOURCES=dynlib2.c -install-data-local: +install-exec-hook: $(RM) $(DESTDIR)$(libdir)/*dynlib* else diff --git a/test/Makefile.in b/test/Makefile.in index 194a508..da4432b 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1512,7 +1512,7 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@HAVE_SHARED_CONDITIONAL_FALSE@install-data-local: +@HAVE_SHARED_CONDITIONAL_FALSE@install-exec-hook: clean: clean-am clean-am: clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \ @@ -1537,14 +1537,15 @@ info: info-am info-am: -install-data-am: install-data-local +install-data-am: 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: @@ -1585,7 +1586,7 @@ ps-am: uninstall-am: uninstall-libLTLIBRARIES -.MAKE: check-am install-am install-strip +.MAKE: check-am install-am install-exec-am install-strip .PHONY: CTAGS GTAGS all all-am all-local check check-TESTS check-am \ clean clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \ @@ -1593,8 +1594,8 @@ uninstall-am: uninstall-libLTLIBRARIES cscopelist ctags distclean distclean-compile distclean-generic \ distclean-libtool 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-data-am install-dvi 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 \ @@ -1620,7 +1621,7 @@ help: @HAVE_SHARED_CONDITIONAL_TRUE@ # The libdynlib1 and libdynlib2 library for testing plugin module plugin.c. @HAVE_SHARED_CONDITIONAL_TRUE@ # Build it as shared library if configure is enabled for shared library. -@HAVE_SHARED_CONDITIONAL_TRUE@install-data-local: +@HAVE_SHARED_CONDITIONAL_TRUE@install-exec-hook: @HAVE_SHARED_CONDITIONAL_TRUE@ $(RM) $(DESTDIR)$(libdir)/*dynlib* @HAVE_SHARED_CONDITIONAL_FALSE@ # The libh5test library provides common support code for the tests. |