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 /hl/c++ | |
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 'hl/c++')
-rw-r--r-- | hl/c++/examples/Makefile.am | 2 | ||||
-rw-r--r-- | hl/c++/examples/Makefile.in | 3 |
2 files changed, 3 insertions, 2 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 \ |