summaryrefslogtreecommitdiffstats
path: root/c++
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2010-04-30 20:28:45 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2010-04-30 20:28:45 (GMT)
commit6d912b639416158f700397909996f2687473cfd3 (patch)
tree465e979e449cf54b36cc80e8a282788bda2c4d6d /c++
parentd44e26b78a60bdccb59e2935a07a0cbef7eb5321 (diff)
downloadhdf5-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 'c++')
-rw-r--r--c++/examples/Makefile.am2
-rw-r--r--c++/examples/Makefile.in5
2 files changed, 4 insertions, 3 deletions
diff --git a/c++/examples/Makefile.am b/c++/examples/Makefile.am
index f97a3f3..481d75f 100644
--- a/c++/examples/Makefile.am
+++ b/c++/examples/Makefile.am
@@ -38,7 +38,7 @@ chunks.chkexe_: extend_ds.chkexe_
CXX_API=yes
# Where to install examples
-EXAMPLEDIR=$(docdir)/hdf5/examples/c++
+EXAMPLEDIR=$(exec_prefix)/examples/c++
# How to build programs using h5c++
$(EXTRA_PROG): $(H5CPP)
diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in
index 46a50c5..385af248 100644
--- a/c++/examples/Makefile.in
+++ b/c++/examples/Makefile.in
@@ -345,7 +345,7 @@ INSTALL_FILES = create.cpp readdata.cpp writedata.cpp compound.cpp \
CXX_API = yes
# Where to install examples
-EXAMPLEDIR = $(docdir)/hdf5/examples/c++
+EXAMPLEDIR = $(exec_prefix)/examples/c++
# Assume that all tests in this directory are examples, and tell
# conclude.am when to build them.
@@ -606,12 +606,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 \