diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-03-30 18:10:36 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-03-30 18:10:36 (GMT) |
| commit | 944cbb940009119de7ccae8a42734b38d03ea2c7 (patch) | |
| tree | b9d49b1c9264e988c533a53c3052abf4d292faf5 /c++/examples | |
| parent | 4c14a0e3db852b6f1e9811a7396d85cc81c85ea8 (diff) | |
| download | hdf5-944cbb940009119de7ccae8a42734b38d03ea2c7.zip hdf5-944cbb940009119de7ccae8a42734b38d03ea2c7.tar.gz hdf5-944cbb940009119de7ccae8a42734b38d03ea2c7.tar.bz2 | |
TRILAB-192 merging warnings changes from develop
Diffstat (limited to 'c++/examples')
| -rw-r--r-- | c++/examples/Makefile.am | 4 | ||||
| -rw-r--r-- | c++/examples/run-c++-ex.sh.in | 4 |
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..4667878 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_relto_examplesdir}}" AR="@AR@" RANLIB="@RANLIB@" H5TOOL="h5c++" # The tool name |