summaryrefslogtreecommitdiffstats
path: root/hl
diff options
context:
space:
mode:
Diffstat (limited to 'hl')
-rw-r--r--hl/c++/examples/Makefile.in6
-rw-r--r--hl/examples/Makefile.in4
-rw-r--r--hl/fortran/examples/Makefile.in6
3 files changed, 11 insertions, 5 deletions
diff --git a/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in
index 032d8d8..3bf06e7 100644
--- a/hl/c++/examples/Makefile.in
+++ b/hl/c++/examples/Makefile.in
@@ -342,7 +342,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++
# Assume that all tests in this directory are examples, and tell
# conclude.am when to build them.
@@ -598,7 +598,9 @@ install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) $(TEST_SCRIPT)
(set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);\
fi; \
done
- @(set -x; $(INSTALL) $(builddir)/$(TEST_SCRIPT) $(EXAMPLEDIR)/.. || exit 1);
+ @if test $(TEST_SCRIPT) != X; then \
+ (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.in b/hl/examples/Makefile.in
index d4e2e94..0067e60 100644
--- a/hl/examples/Makefile.in
+++ b/hl/examples/Makefile.in
@@ -631,7 +631,9 @@ install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) $(TEST_SCRIPT)
(set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);\
fi; \
done
- @(set -x; $(INSTALL) $(builddir)/$(TEST_SCRIPT) $(EXAMPLEDIR)/.. || exit 1);
+ @if test $(TEST_SCRIPT) != X; then \
+ (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.in b/hl/fortran/examples/Makefile.in
index e0acfea..58e24a9 100644
--- a/hl/fortran/examples/Makefile.in
+++ b/hl/fortran/examples/Makefile.in
@@ -348,7 +348,7 @@ INSTALL_FILES =
FORTRAN_API = yes
# Tell automake how to install examples
-EXAMPLEDIR = $(docdir)/hdf5/examples/hl/fortran
+EXAMPLEDIR = $(exec_prefix)/examples/hl/fortran
# Assume that all tests in this directory are examples, and tell
# conclude.am when to build them.
@@ -599,7 +599,9 @@ install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) $(TEST_SCRIPT)
(set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);\
fi; \
done
- @(set -x; $(INSTALL) $(builddir)/$(TEST_SCRIPT) $(EXAMPLEDIR)/.. || exit 1);
+ @if test $(TEST_SCRIPT) != X; then \
+ (set -x; $(INSTALL) $(builddir)/$(TEST_SCRIPT) $(EXAMPLEDIR)/.. \
+ || exit 1);
uninstall-examples:
@if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then \