summaryrefslogtreecommitdiffstats
path: root/hl/examples
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 /hl/examples
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 'hl/examples')
-rw-r--r--hl/examples/Makefile.am2
-rw-r--r--hl/examples/Makefile.in5
2 files changed, 4 insertions, 3 deletions
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 \