diff options
Diffstat (limited to 'hl')
-rw-r--r-- | hl/c++/examples/Makefile.am | 2 | ||||
-rw-r--r-- | hl/c++/examples/Makefile.in | 3 | ||||
-rw-r--r-- | hl/examples/Makefile.am | 2 | ||||
-rw-r--r-- | hl/examples/Makefile.in | 5 | ||||
-rw-r--r-- | hl/fortran/examples/Makefile.am | 2 | ||||
-rw-r--r-- | hl/fortran/examples/Makefile.in | 3 |
6 files changed, 10 insertions, 7 deletions
diff --git a/hl/c++/examples/Makefile.am b/hl/c++/examples/Makefile.am index 7ccc92b..5bc17d0 100644 --- a/hl/c++/examples/Makefile.am +++ b/hl/c++/examples/Makefile.am @@ -32,7 +32,7 @@ INSTALL_FILES=ptExampleFL.cpp ptExampleVL.cpp CXX_API=yes # Where to install examples -EXAMPLEDIR=$(docdir)/hdf5/examples/hl/c++ +EXAMPLEDIR=$(exec_prefix)/examples/hl/c++ # How to build programs using h5c++ $(EXTRA_PROG): $(H5CPP) diff --git a/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in index 51c04ad..032d8d8 100644 --- a/hl/c++/examples/Makefile.in +++ b/hl/c++/examples/Makefile.in @@ -592,12 +592,13 @@ install-data-local: uninstall-local: @$(MAKE) $(AM_MAKEFLAGS) uninstall-examples -install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) +install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) $(TEST_SCRIPT) @for f in X $(INSTALL_FILES); do \ if test $$f != X; then \ (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);\ fi; \ done + @(set -x; $(INSTALL) $(builddir)/$(TEST_SCRIPT) $(EXAMPLEDIR)/.. || exit 1); uninstall-examples: @if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then \ diff --git a/hl/examples/Makefile.am b/hl/examples/Makefile.am index 9d601ee..6e5afe4 100644 --- a/hl/examples/Makefile.am +++ b/hl/examples/Makefile.am @@ -26,7 +26,7 @@ if BUILD_PARALLEL_CONDITIONAL endif # Example directory -EXAMPLEDIR=$(docdir)/hdf5/examples/hl/c +EXAMPLEDIR=$(exec_prefix)/examples/hl/c # Example programs. # Don't tell automake about them, because if it knew they were programs, diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in index 31c21f0..d4e2e94 100644 --- a/hl/examples/Makefile.in +++ b/hl/examples/Makefile.in @@ -333,7 +333,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 @BUILD_PARALLEL_CONDITIONAL_TRUE@TEST_PROG_PARA = # Example directory -EXAMPLEDIR = $(docdir)/hdf5/examples/hl/c +EXAMPLEDIR = $(exec_prefix)/examples/hl/c # Example programs. # Don't tell automake about them, because if it knew they were programs, @@ -625,12 +625,13 @@ install-data-local: uninstall-local: @$(MAKE) $(AM_MAKEFLAGS) uninstall-examples -install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) +install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) $(TEST_SCRIPT) @for f in X $(INSTALL_FILES); do \ if test $$f != X; then \ (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);\ fi; \ done + @(set -x; $(INSTALL) $(builddir)/$(TEST_SCRIPT) $(EXAMPLEDIR)/.. || exit 1); uninstall-examples: @if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then \ diff --git a/hl/fortran/examples/Makefile.am b/hl/fortran/examples/Makefile.am index 0d910ad..1385b18 100644 --- a/hl/fortran/examples/Makefile.am +++ b/hl/fortran/examples/Makefile.am @@ -49,7 +49,7 @@ $(EXTRA_PROG): $(H5FC) endif # Tell automake how to install examples -EXAMPLEDIR=$(docdir)/hdf5/examples/hl/fortran +EXAMPLEDIR=$(exec_prefix)/examples/hl/fortran # List dependencies for each example. Normally, automake would take # care of this for us, but if we tell automake about the programs it diff --git a/hl/fortran/examples/Makefile.in b/hl/fortran/examples/Makefile.in index b2336ca..e0acfea 100644 --- a/hl/fortran/examples/Makefile.in +++ b/hl/fortran/examples/Makefile.in @@ -593,12 +593,13 @@ install-data-local: uninstall-local: @$(MAKE) $(AM_MAKEFLAGS) uninstall-examples -install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) +install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) $(TEST_SCRIPT) @for f in X $(INSTALL_FILES); do \ if test $$f != X; then \ (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);\ fi; \ done + @(set -x; $(INSTALL) $(builddir)/$(TEST_SCRIPT) $(EXAMPLEDIR)/.. || exit 1); uninstall-examples: @if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then \ |