summaryrefslogtreecommitdiffstats
path: root/hl
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2011-05-04 16:43:16 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2011-05-04 16:43:16 (GMT)
commita2f52de36df0385588493d4e620c5f6471aa53c0 (patch)
tree73f3aec6b5a6e762c7d53ccef670158db3456852 /hl
parentece690cdb66a1d116f557fca4f5bf5800e4bc522 (diff)
downloadhdf5-a2f52de36df0385588493d4e620c5f6471aa53c0.zip
hdf5-a2f52de36df0385588493d4e620c5f6471aa53c0.tar.gz
hdf5-a2f52de36df0385588493d4e620c5f6471aa53c0.tar.bz2
[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.
Diffstat (limited to 'hl')
-rwxr-xr-xhl/c++/examples/run-hlc++-ex.sh.in4
-rwxr-xr-xhl/examples/run-hlc-ex.sh.in4
-rwxr-xr-xhl/fortran/examples/run-hlfortran-ex.sh.in4
3 files changed, 6 insertions, 6 deletions
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@"