summaryrefslogtreecommitdiffstats
path: root/c++
diff options
context:
space:
mode:
authorDavid Young <dyoung@hdfgroup.org>2019-10-03 22:30:46 (GMT)
committerDavid Young <dyoung@hdfgroup.org>2019-10-03 22:30:46 (GMT)
commit82f647534c309ff97e4827fb95949954aeed4a26 (patch)
tree6258917ded5ace02e773ca318e6255a509cb7d24 /c++
parent09bb031cf19e656ef8646a1448af5206b1b1cc29 (diff)
downloadhdf5-82f647534c309ff97e4827fb95949954aeed4a26.zip
hdf5-82f647534c309ff97e4827fb95949954aeed4a26.tar.gz
hdf5-82f647534c309ff97e4827fb95949954aeed4a26.tar.bz2
Make some NetBSD compatibility patches.
Diffstat (limited to 'c++')
-rw-r--r--c++/examples/Makefile.am4
-rw-r--r--c++/examples/run-c++-ex.sh.in4
2 files changed, 4 insertions, 4 deletions
diff --git a/c++/examples/Makefile.am b/c++/examples/Makefile.am
index 51ab8e3..0648504 100644
--- a/c++/examples/Makefile.am
+++ b/c++/examples/Makefile.am
@@ -49,8 +49,8 @@ CXX_API=yes
# Where to install examples
# Note: no '/' after DESTDIR. Explanation in commence.am
-EXAMPLEDIR=${DESTDIR}$(exec_prefix)/share/hdf5_examples/c++
-EXAMPLETOPDIR=${DESTDIR}$(exec_prefix)/share/hdf5_examples
+EXAMPLEDIR=$(examplesdir)/c++
+EXAMPLETOPDIR=$(examplesdir)
# How to build programs using h5c++
$(EXTRA_PROG): $(H5CPP)
diff --git a/c++/examples/run-c++-ex.sh.in b/c++/examples/run-c++-ex.sh.in
index d975924..d01cb7f 100644
--- a/c++/examples/run-c++-ex.sh.in
+++ b/c++/examples/run-c++-ex.sh.in
@@ -18,7 +18,7 @@
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# #
# This script will compile and run the c++ examples from source files #
-# installed in .../share/hdf5_examples/c++ using h5c++. The #
+# installed in @examplesdir@/c++ using h5c++. The #
# order for running programs with RunTest in the MAIN section below is taken #
# from the Makefile. The order is important since some of the test programs #
# use data files created by earlier test programs. Any future additions should #
@@ -32,7 +32,7 @@ EXIT_FAILURE=1
# Where the tool is installed.
# default is relative path to installed location of the tools
-prefix="${prefix:-../../..}"
+prefix="${prefix:-@prefix@}"
AR="@AR@"
RANLIB="@RANLIB@"
H5TOOL="h5c++" # The tool name