diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2010-04-30 20:28:45 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2010-04-30 20:28:45 (GMT) |
| commit | 6d912b639416158f700397909996f2687473cfd3 (patch) | |
| tree | 465e979e449cf54b36cc80e8a282788bda2c4d6d /fortran/examples | |
| parent | d44e26b78a60bdccb59e2935a07a0cbef7eb5321 (diff) | |
| download | hdf5-6d912b639416158f700397909996f2687473cfd3.zip hdf5-6d912b639416158f700397909996f2687473cfd3.tar.gz hdf5-6d912b639416158f700397909996f2687473cfd3.tar.bz2 | |
[svn-r18680] Added running make install-examples to make install. Make install-examples will still install example files and make install will also install them.
Diffstat (limited to 'fortran/examples')
| -rw-r--r-- | fortran/examples/Makefile.am | 2 | ||||
| -rw-r--r-- | fortran/examples/Makefile.in | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/fortran/examples/Makefile.am b/fortran/examples/Makefile.am index 772cb13..bb3be1a 100644 --- a/fortran/examples/Makefile.am +++ b/fortran/examples/Makefile.am @@ -64,7 +64,7 @@ $(EXTRA_PROG): $(H5FC) endif # Tell automake how to install examples -EXAMPLEDIR=$(docdir)/hdf5/examples/fortran +EXAMPLEDIR=$(exec_prefix)/examples/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/fortran/examples/Makefile.in b/fortran/examples/Makefile.in index 7a92157..7dc2521 100644 --- a/fortran/examples/Makefile.in +++ b/fortran/examples/Makefile.in @@ -356,7 +356,7 @@ INSTALL_FILES = dsetexample.f90 fileexample.f90 rwdsetexample.f90 \ FORTRAN_API = yes # Tell automake how to install examples -EXAMPLEDIR = $(docdir)/hdf5/examples/fortran +EXAMPLEDIR = $(exec_prefix)/examples/fortran # Assume that all tests in this directory are examples, and tell # conclude.am when to build them. @@ -634,12 +634,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 \ |