diff options
author | Larry Knox <lrknox@hdfgroup.org> | 2011-05-04 16:41:19 (GMT) |
---|---|---|
committer | Larry Knox <lrknox@hdfgroup.org> | 2011-05-04 16:41:19 (GMT) |
commit | be60cc1759b1b0907dd23962359077e1d54596c1 (patch) | |
tree | 47c6434305a0c3eb953b8dc3a89b1a6e15119a84 /examples | |
parent | c847e38551cdd190d9e91158ecf01270003375a2 (diff) | |
download | hdf5-be60cc1759b1b0907dd23962359077e1d54596c1.zip hdf5-be60cc1759b1b0907dd23962359077e1d54596c1.tar.gz hdf5-be60cc1759b1b0907dd23962359077e1d54596c1.tar.bz2 |
[svn-r20719] Merge changes to scripts to run installed examples from hdf5 1.8.7 r 20718. The default prefix in the scripts will use the compile scripts in the installed bin directory.
Diffstat (limited to 'examples')
-rwxr-xr-x | examples/run-all-ex.sh | 4 | ||||
-rwxr-xr-x | examples/run-c-ex.sh.in | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/run-all-ex.sh b/examples/run-all-ex.sh index 6837c7e..4ff2c55 100755 --- a/examples/run-all-ex.sh +++ b/examples/run-all-ex.sh @@ -24,8 +24,8 @@ # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # -if (echo "Run c examples" && \ - (cd c; sh ./run-c-ex.sh) && \ +echo "Run c examples" +if ((cd c; sh ./run-c-ex.sh) && \ (if test -d fortran; then echo "Run fortran examples" cd fortran; sh ./run-fortran-ex.sh diff --git a/examples/run-c-ex.sh.in b/examples/run-c-ex.sh.in index 0627eb8..8d0bdcd 100755 --- a/examples/run-c-ex.sh.in +++ b/examples/run-c-ex.sh.in @@ -32,8 +32,8 @@ EXIT_SUCCESS=0 EXIT_FAILURE=1 # Where the tool is installed. -# Note: no '/' after DESTDIR. Explanation in commence.am -prefix="${prefix:-${DESTDIR}@prefix@}" +# default is relative path to installed location of the tools +prefix="${prefix:-../../../}" PARALLEL=@PARALLEL@ # Am I in parallel mode? AR="@AR@" RANLIB="@RANLIB@" |