[svn-r20720] 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.

7 files changed, 14 insertions, 14 deletions

diff --git a/c++/examples/run-c++-ex.sh.in b/c++/examples/run-c++-ex.sh.in
index 21db584..6b33577 100755
--- a/c++/examples/run-c++-ex.sh.in
+++ b/c++/examples/run-c++-ex.sh.in
@@ -33,8 +33,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:-../../../}"
 AR="@AR@"
 RANLIB="@RANLIB@"
 H5TOOL="h5c++"                  # The tool name
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@"
diff --git a/fortran/examples/run-fortran-ex.sh.in b/fortran/examples/run-fortran-ex.sh.in
index 2ab4aef..873669f 100755
--- a/fortran/examples/run-fortran-ex.sh.in
+++ b/fortran/examples/run-fortran-ex.sh.in
@@ -33,8 +33,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@"
diff --git a/hl/c++/examples/run-hlc++-ex.sh.in b/hl/c++/examples/run-hlc++-ex.sh.in
index b800981..7742f99 100755
--- a/hl/c++/examples/run-hlc++-ex.sh.in
+++ b/hl/c++/examples/run-hlc++-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:-../../../../}"
 AR="@AR@"
 RANLIB="@RANLIB@"
 H5TOOL="h5c++"                  # The tool name
diff --git a/hl/examples/run-hlc-ex.sh.in b/hl/examples/run-hlc-ex.sh.in
index ae3fcdb..a82e591 100755
--- a/hl/examples/run-hlc-ex.sh.in
+++ b/hl/examples/run-hlc-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@"
diff --git a/hl/fortran/examples/run-hlfortran-ex.sh.in b/hl/fortran/examples/run-hlfortran-ex.sh.in
index 919771d..2780bff 100755
--- a/hl/fortran/examples/run-hlfortran-ex.sh.in
+++ b/hl/fortran/examples/run-hlfortran-ex.sh.in
@@ -33,8 +33,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@"