diff options
| author | Jerome Soumagne <jsoumagne@hdfgroup.org> | 2019-12-09 18:16:52 (GMT) |
|---|---|---|
| committer | Jerome Soumagne <jsoumagne@hdfgroup.org> | 2019-12-09 18:16:52 (GMT) |
| commit | 49fe497201bcefcd9beb01fe8fc2175974b73799 (patch) | |
| tree | 82ec36c32198122e75c1dfa20e61678b8722f56b /c++ | |
| parent | 62e6349eabb00c69fa69aab0fbe34cdc092d072f (diff) | |
| download | hdf5-49fe497201bcefcd9beb01fe8fc2175974b73799.zip hdf5-49fe497201bcefcd9beb01fe8fc2175974b73799.tar.gz hdf5-49fe497201bcefcd9beb01fe8fc2175974b73799.tar.bz2 | |
Revert "Merge branch 'hdf5_1_12' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into hdf5_1_12"
This reverts commit 9f9336a5bd541752f472bab4c93da8de89f862cd, reversing
changes made to 437a1919e7ba60fe75a33a466d264183a0255319.
Diffstat (limited to 'c++')
| -rw-r--r-- | c++/examples/Makefile.am | 4 | ||||
| -rw-r--r-- | c++/examples/run-c++-ex.sh.in | 27 |
2 files changed, 4 insertions, 27 deletions
diff --git a/c++/examples/Makefile.am b/c++/examples/Makefile.am index 0648504..51ab8e3 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=$(examplesdir)/c++ -EXAMPLETOPDIR=$(examplesdir) +EXAMPLEDIR=${DESTDIR}$(exec_prefix)/share/hdf5_examples/c++ +EXAMPLETOPDIR=${DESTDIR}$(exec_prefix)/share/hdf5_examples # 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 03e1eac..d975924 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 @examplesdir@/c++ using h5c++. The # +# installed in .../share/hdf5_examples/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 # @@ -30,32 +30,9 @@ EXIT_SUCCESS=0 EXIT_FAILURE=1 -# -# Try to derive the path to the installation $prefix established -# by ./configure relative to the examples directory established by -# ./configure. If successful, set `prefix_relto_examplesdir` to the -# relative path. Otherwise, set `prefix_relto_examplesdir` to the -# absolute installation $prefix. -# -# This script uses the value of `prefix` in the user's environment, if -# it is set, below. The content of $() is evaluated in a sub-shell, so -# if `prefix` is set in the user's environment, the shell statements in -# $() won't clobbered it. -# -prefix_relto_examplesdir=$( -prefix=@prefix@ -examplesdir=@examplesdir@ -if [ ${examplesdir##${prefix}/} != ${examplesdir} ]; then - echo $(echo ${examplesdir##${prefix}/} | \ - sed 's,[^/][^/]*,..,g') -else - echo $prefix -fi -) - # Where the tool is installed. # default is relative path to installed location of the tools -prefix="${prefix:-../${prefix_relto_examplesdir}}" +prefix="${prefix:-../../..}" AR="@AR@" RANLIB="@RANLIB@" H5TOOL="h5c++" # The tool name |