diff options
author | Larry Knox <lrknox@hdfgroup.org> | 2010-09-16 22:12:07 (GMT) |
---|---|---|
committer | Larry Knox <lrknox@hdfgroup.org> | 2010-09-16 22:12:07 (GMT) |
commit | 696675029e4bd3461bc175fb9d9b3406767acbfd (patch) | |
tree | 127f396203cf7bfc798ae684818aac5ff40fd46c /hl/examples/run-hl-ex.sh | |
parent | 6d97ffcc6cec0c23e718da16fcf0f2043df046c5 (diff) | |
download | hdf5-696675029e4bd3461bc175fb9d9b3406767acbfd.zip hdf5-696675029e4bd3461bc175fb9d9b3406767acbfd.tar.gz hdf5-696675029e4bd3461bc175fb9d9b3406767acbfd.tar.bz2 |
[svn-r19408] In this revision the '/' after ${DESTDIR} wherever it occurs
has been removed. According to the official description of DESTDIR by Gnu at
http://www.gnu.org/prep/standards/html_node/DESTDIR.html, DESTDIR is
prepended to the normal and complete install path that it precedes for the
purpose of installing in a temporary directory which is useful for building
rpms and other packages. The '/' after ${DESTDIR} will be followed by another
'/' at the beginning of the normal install path. When DESTDIR is empty the
path then begins with '//', which is incorrect and causes problems at least for
Cygwin.
The change made in config/commence.am affects many Makefile.*s when bin/reconfigure
is run. EXAMPLEDIRs had to be corrected individually.
Also the scripts to run examples after they are installed have checks added to see
that the fortran and c++ directories are present before trying to run the scripts
in them.
Tested with h5committest on amani, heiwa and jam.
Diffstat (limited to 'hl/examples/run-hl-ex.sh')
-rwxr-xr-x | hl/examples/run-hl-ex.sh | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/hl/examples/run-hl-ex.sh b/hl/examples/run-hl-ex.sh index 0478f76..5fa97c0 100755 --- a/hl/examples/run-hl-ex.sh +++ b/hl/examples/run-hl-ex.sh @@ -25,10 +25,14 @@ if (echo "Run hl c examples" && \ (cd c; sh ./run-hlc-ex.sh) && \ - echo "Run hl fortran examples" && \ - (cd fortran; sh ./run-hlfortran-ex.sh) && \ - echo "Run hl c++ examples" && \ - (cd c++; sh ./run-hlc++-ex.sh)); then + (if test -d fortran; then + echo "Run hl fortran examples" + cd fortran; sh ./run-hlfortran-ex.sh + fi) + (if test -d c++; then + echo "Run hl c++ examples" + cd c++; sh ./run-hlc++-ex.sh + fi)); then echo "Finished running hl examples" exit 0 else |