diff options
| author | kmu <kmu@hdfgroup.org> | 2019-11-07 20:51:40 (GMT) |
|---|---|---|
| committer | kmu <kmu@hdfgroup.org> | 2019-11-07 20:51:40 (GMT) |
| commit | 815611a318b64010e1dc70691a132ee18e0385f5 (patch) | |
| tree | c66cdb2df58374d936d417d888f25495842c1263 /hl/examples | |
| parent | 8b9338ab57eec0cc8fa5a36c44d7b28e52e9a466 (diff) | |
| parent | 2dd5bbfe167e3e9b6b6ee657a882e24072de4aeb (diff) | |
| download | hdf5-815611a318b64010e1dc70691a132ee18e0385f5.zip hdf5-815611a318b64010e1dc70691a132ee18e0385f5.tar.gz hdf5-815611a318b64010e1dc70691a132ee18e0385f5.tar.bz2 | |
Merge branch 'develop' of https://git.hdfgroup.org/scm/~kmu/hdf5 into develop
Diffstat (limited to 'hl/examples')
| -rw-r--r-- | hl/examples/Makefile.am | 4 | ||||
| -rw-r--r-- | hl/examples/run-hlc-ex.sh.in | 27 |
2 files changed, 27 insertions, 4 deletions
diff --git a/hl/examples/Makefile.am b/hl/examples/Makefile.am index 29e1a48..cc2d671 100644 --- a/hl/examples/Makefile.am +++ b/hl/examples/Makefile.am @@ -25,8 +25,8 @@ endif # Example directory # Note: no '/' after DESTDIR. Explanation in commence.am -EXAMPLEDIR=${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl/c -EXAMPLETOPDIR=${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl +EXAMPLEDIR=$(examplesdir)/hl/c +EXAMPLETOPDIR=$(examplesdir)/hl INSTALL_SCRIPT_FILES = run-hlc-ex.sh INSTALL_TOP_SCRIPT_FILES = run-hl-ex.sh diff --git a/hl/examples/run-hlc-ex.sh.in b/hl/examples/run-hlc-ex.sh.in index f51b165..ceb77dd 100644 --- a/hl/examples/run-hlc-ex.sh.in +++ b/hl/examples/run-hlc-ex.sh.in @@ -18,7 +18,7 @@ # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # This script will compile and run the c examples from source files installed # -# in .../share/hdf5_examples/hl/c using h5cc or h5pc. The order for running # +# in @examplesdir@/hl/c using h5cc or h5pc. 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 be placed accordingly. # @@ -29,9 +29,32 @@ 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 -E 's,[^/]+,..,g') +else + echo $prefix +fi +) + # Where the tool is installed. # default is relative path to installed location of the tools -prefix="${prefix:-../../../..}" +prefix="${prefix:-../../${prefix_relto_examplesdir}}" PARALLEL=@PARALLEL@ # Am I in parallel mode? AR="@AR@" RANLIB="@RANLIB@" |