[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.

4 files changed, 23 insertions, 9 deletions

diff --git a/fortran/examples/Makefile.am b/fortran/examples/Makefile.am
index f27f7ff..57a8f94 100644
--- a/fortran/examples/Makefile.am
+++ b/fortran/examples/Makefile.am
@@ -65,7 +65,8 @@ $(EXTRA_PROG): $(H5FC)
 endif
 
 # Tell automake how to install examples
-EXAMPLEDIR=${DESTDIR}/$(exec_prefix)/share/hdf5_examples/fortran
+# Note: no '/' after DESTDIR.  Explanation in commence.am
+EXAMPLEDIR=${DESTDIR}$(exec_prefix)/share/hdf5_examples/fortran
 
 # List dependencies for each example.  Normally, automake would take
 # care of this for us, but if we tell automake about the programs it
diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in
index 493fe0c..b102e5c 100644
--- a/fortran/examples/Makefile.in
+++ b/fortran/examples/Makefile.in
@@ -316,14 +316,24 @@ LIBH5_HL = $(top_builddir)/hl/src/libhdf5_hl.la
 LIBH5F_HL = $(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la
 LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
 
+# Note that in svn revision 19400 the '/' after DESTDIR in H5* variables below  
+# 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.   
+
 # Scripts used to build examples
 # If only shared libraries have been installed, have h5cc build examples with
 # shared libraries instead of static libraries
-H5CC = ${DESTDIR}/$(bindir)/h5cc
-H5CC_PP = ${DESTDIR}/$(bindir)/h5pcc
-H5FC = ${DESTDIR}/$(bindir)/h5fc
-H5FC_PP = ${DESTDIR}/$(bindir)/h5pfc
-H5CPP = ${DESTDIR}/$(bindir)/h5c++
+H5CC = ${DESTDIR}$(bindir)/h5cc
+H5CC_PP = ${DESTDIR}$(bindir)/h5pcc
+H5FC = ${DESTDIR}$(bindir)/h5fc
+H5FC_PP = ${DESTDIR}$(bindir)/h5pfc
+H5CPP = ${DESTDIR}$(bindir)/h5c++
 ACLOCAL_AMFLAGS = "-I m4"
 
 # The trace script; this is used on source files from the C library to
@@ -361,7 +371,8 @@ INSTALL_SCRIPT_FILES = run-fortran-ex.sh
 FORTRAN_API = yes
 
 # Tell automake how to install examples
-EXAMPLEDIR = ${DESTDIR}/$(exec_prefix)/share/hdf5_examples/fortran
+# Note: no '/' after DESTDIR.  Explanation in commence.am
+EXAMPLEDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/fortran
 
 # Assume that all tests in this directory are examples, and tell
 # conclude.am when to build them.
diff --git a/fortran/examples/run-fortran-ex.sh.in b/fortran/examples/run-fortran-ex.sh.in
index 1564537..b29eaaf 100755
--- a/fortran/examples/run-fortran-ex.sh.in
+++ b/fortran/examples/run-fortran-ex.sh.in
@@ -33,7 +33,8 @@ EXIT_SUCCESS=0
 EXIT_FAILURE=1
 
 # Where the tool is installed.
-prefix="${prefix:-${DESTDIR}/@prefix@}"
+# Note: no '/' after DESTDIR.  Explanation in commence.am
+prefix="${prefix:-${DESTDIR}@prefix@}"
 PARALLEL=@PARALLEL@             # Am I in parallel mode?
 AR="@AR@"
 RANLIB="@RANLIB@"
diff --git a/fortran/examples/testh5fc.sh.in b/fortran/examples/testh5fc.sh.in
index 8228ca6..cc26e37 100755
--- a/fortran/examples/testh5fc.sh.in
+++ b/fortran/examples/testh5fc.sh.in
@@ -25,7 +25,8 @@ EXIT_SUCCESS=0
 EXIT_FAILURE=1
 
 # Where the tool is installed.
-prefix="${prefix:-${DESTDIR}/@prefix@}"
+# Note: no '/' after DESTDIR.  Explanation in commence.am
+prefix="${prefix:-${DESTDIR}@prefix@}"
 PARALLEL=@PARALLEL@		# Am I in parallel mode?
 AR="@AR@"
 RANLIB="@RANLIB@"