[svn-r19786] 1. Change default prefix for running compile scripts in the scripts that compile and run the installed examples to a relative path that doesn't need to be changed by h5redeploy.

2. Add README file to the hdf5_examples directory that explains what running the run will do.
3. Install non-executable files with non-executable permissions.

Tested with h5 committest + make install, sh run-all-ex.sh, and make uninstall on amani, heiwa and jam.

20 files changed, 298 insertions, 209 deletions

diff --git a/MANIFEST b/MANIFEST
index 8b2e209..9f16cbd 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1736,7 +1736,7 @@
 ./hl/examples/image8.txt
 ./hl/examples/pal_rgb.h
 ./hl/examples/ptExampleFL.c
-./hl/examples/ptExampleVL.c
+./hl/examples/ptExampleVL.c                   _DO_NOT_DISTRIBUTE_
 ./hl/examples/run-hl-ex.sh
 ./hl/examples/run-hlc-ex.sh.in
 ./hl/src/COPYING
@@ -1844,7 +1844,7 @@
 ./hl/c++/examples/Makefile.am
 ./hl/c++/examples/Makefile.in
 ./hl/c++/examples/ptExampleFL.cpp
-./hl/c++/examples/ptExampleVL.cpp
+./hl/c++/examples/ptExampleVL.cpp                   _DO_NOT_DISTRIBUTE_
 ./hl/c++/examples/run-hlc++-ex.sh.in
 ./hl/c++/src/H5PacketTable.h
 ./hl/c++/src/H5PacketTable.cpp
@@ -1933,6 +1933,7 @@
 ./c++/test/CMakeLists.txt
 ./examples/CMakeLists.txt
 ./examples/run-all-ex.sh
+./examples/README
 ./examples/run-c-ex.sh.in
 ./fortran/CMakeLists.txt
 ./fortran/examples/CMakeLists.txt
diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in
index 4d797f0..55c59b1 100644
--- a/c++/examples/Makefile.in
+++ b/c++/examples/Makefile.in
@@ -627,42 +627,52 @@ uninstall-local:
 	@$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
 
 install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) 
-	@for f in X $(INSTALL_FILES); do                                     \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);\
-	  fi;                                                                \
+	@for f in X $(INSTALL_FILES); do                                       \
+	  if test $$f != X; then                                               \
+	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);      \
+            chmod a-x $(EXAMPLEDIR)/$$f;                                       \
+	  fi;                                                                  \
 	done
-	@for f in X $(INSTALL_SCRIPT_FILES); do                                   \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $$f $(EXAMPLEDIR)/. || exit 1);\
-	  fi;                                                                \
+	@for f in X $(INSTALL_SCRIPT_FILES); do                                \
+	  if test $$f != X; then                                               \
+	    (set -x; $(INSTALL) $$f $(EXAMPLEDIR)/. || exit 1);                \
+	  fi;                                                                  \
 	done
-	@for f in X $(INSTALL_TOP_SCRIPT_FILES); do                       \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1); \
-	  fi;                                                                \
+	@for f in X $(INSTALL_TOP_FILES); do                                   \
+	  if test $$f != X; then                                               \
+	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1);   \
+            chmod a-x $(EXAMPLETOPDIR)/$$f;\
+	  fi;                                                                  \
+	done
+	@for f in X $(INSTALL_TOP_SCRIPT_FILES); do                            \
+	  if test $$f != X; then                                               \
+	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1);   \
+	  fi;                                                                  \
 	done
 
 uninstall-examples:
-	@if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then             \
-	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_FILES);                \
+	@if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then               \
+	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_FILES);                  \
+        fi
+	@if test -n "$(INSTALL_SCRIPT_FILES)" -a -d $(EXAMPLEDIR); then        \
+	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_SCRIPT_FILES);           \
         fi
-	@if test -n "$(INSTALL_SCRIPT_FILES)" -a -d $(EXAMPLEDIR); then           \
-	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_SCRIPT_FILES);              \
+	@if test -n "$(INSTALL_TOP_FILES)" -a -d $(EXAMPLETOPDIR); then        \
+	  set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_FILES);           \
         fi
-	@if test -n "$(INSTALL_TOP_SCRIPT_FILES)" -a -d $(EXAMPLETOPDIR); then    \
-	  set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_SCRIPT_FILES);       \
+	@if test -n "$(INSTALL_TOP_SCRIPT_FILES)" -a -d $(EXAMPLETOPDIR); then \
+	  set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_SCRIPT_FILES);    \
         fi
 
 installcheck-local:
-	@if test "$(STATIC_SHARED)" = "static, shared"; then               \
-	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                \
-	  $(MAKE) $(AM_MAKEFLAGS) clean;                                   \
-	  H5CCFLAGS="" $(MAKE) $(AM_MAKEFLAGS) check;                      \
-	 elif test "$(STATIC_SHARED)" = "shared"; then                     \
-	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                \
-	 else                                                              \
-	  $(MAKE) $(AM_MAKEFLAGS) check;                                   \
+	@if test "$(STATIC_SHARED)" = "static, shared"; then                   \
+	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                    \
+	  $(MAKE) $(AM_MAKEFLAGS) clean;                                       \
+	  H5CCFLAGS="" $(MAKE) $(AM_MAKEFLAGS) check;                          \
+	 elif test "$(STATIC_SHARED)" = "shared"; then                         \
+	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                    \
+	 else                                                                  \
+	  $(MAKE) $(AM_MAKEFLAGS) check;                                       \
 	 fi
 
 # lib/progs/tests targets recurse into subdirectories. build-* targets
diff --git a/c++/examples/run-c++-ex.sh.in b/c++/examples/run-c++-ex.sh.in
index bd7106e..d3bf94e 100755
--- a/c++/examples/run-c++-ex.sh.in
+++ b/c++/examples/run-c++-ex.sh.in
@@ -34,7 +34,7 @@ EXIT_FAILURE=1
 
 # Where the tool is installed.
 # Note: no '/' after DESTDIR.  Explanation in commence.am
-prefix="${prefix:-${DESTDIR}@prefix@}"
+prefix="${prefix:-../../../}"
 AR="@AR@"
 RANLIB="@RANLIB@"
 H5TOOL="h5c++"                  # The tool name
diff --git a/config/examples.am b/config/examples.am
index e48141e..e276bca 100644
--- a/config/examples.am
+++ b/config/examples.am
@@ -65,42 +65,52 @@ uninstall-local:
 	@$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
 
 install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) 
-	@for f in X $(INSTALL_FILES); do                                     \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);\
-	  fi;                                                                \
+	@for f in X $(INSTALL_FILES); do                                       \
+	  if test $$f != X; then                                               \
+	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);      \
+            chmod a-x $(EXAMPLEDIR)/$$f;                                       \
+	  fi;                                                                  \
 	done
-	@for f in X $(INSTALL_SCRIPT_FILES); do                                   \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $$f $(EXAMPLEDIR)/. || exit 1);\
-	  fi;                                                                \
+	@for f in X $(INSTALL_SCRIPT_FILES); do                                \
+	  if test $$f != X; then                                               \
+	    (set -x; $(INSTALL) $$f $(EXAMPLEDIR)/. || exit 1);                \
+	  fi;                                                                  \
 	done
-	@for f in X $(INSTALL_TOP_SCRIPT_FILES); do                       \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1); \
-	  fi;                                                                \
+	@for f in X $(INSTALL_TOP_FILES); do                                   \
+	  if test $$f != X; then                                               \
+	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1);   \
+            chmod a-x $(EXAMPLETOPDIR)/$$f;\
+	  fi;                                                                  \
+	done
+	@for f in X $(INSTALL_TOP_SCRIPT_FILES); do                            \
+	  if test $$f != X; then                                               \
+	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1);   \
+	  fi;                                                                  \
 	done
 
 uninstall-examples:
-	@if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then             \
-	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_FILES);                \
+	@if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then               \
+	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_FILES);                  \
+        fi
+	@if test -n "$(INSTALL_SCRIPT_FILES)" -a -d $(EXAMPLEDIR); then        \
+	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_SCRIPT_FILES);           \
         fi
-	@if test -n "$(INSTALL_SCRIPT_FILES)" -a -d $(EXAMPLEDIR); then           \
-	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_SCRIPT_FILES);              \
+	@if test -n "$(INSTALL_TOP_FILES)" -a -d $(EXAMPLETOPDIR); then        \
+	  set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_FILES);           \
         fi
-	@if test -n "$(INSTALL_TOP_SCRIPT_FILES)" -a -d $(EXAMPLETOPDIR); then    \
-	  set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_SCRIPT_FILES);       \
+	@if test -n "$(INSTALL_TOP_SCRIPT_FILES)" -a -d $(EXAMPLETOPDIR); then \
+	  set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_SCRIPT_FILES);    \
         fi
 
 installcheck-local:
-	@if test "$(STATIC_SHARED)" = "static, shared"; then               \
-	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                \
-	  $(MAKE) $(AM_MAKEFLAGS) clean;                                   \
-	  H5CCFLAGS="" $(MAKE) $(AM_MAKEFLAGS) check;                      \
-	 elif test "$(STATIC_SHARED)" = "shared"; then                     \
-	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                \
-	 else                                                              \
-	  $(MAKE) $(AM_MAKEFLAGS) check;                                   \
+	@if test "$(STATIC_SHARED)" = "static, shared"; then                   \
+	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                    \
+	  $(MAKE) $(AM_MAKEFLAGS) clean;                                       \
+	  H5CCFLAGS="" $(MAKE) $(AM_MAKEFLAGS) check;                          \
+	 elif test "$(STATIC_SHARED)" = "shared"; then                         \
+	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                    \
+	 else                                                                  \
+	  $(MAKE) $(AM_MAKEFLAGS) check;                                       \
 	 fi
 
 
diff --git a/configure b/configure
index 07feb1b..7a92b50 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 19747 2010-11-09 15:19:06Z mamcgree .
+# From configure.in Id: configure.in 19761 2010-11-11 19:03:03Z acheng .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.67 for HDF5 1.8.6-pre2.
 #
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 8a428ae..39ec9fb 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -43,7 +43,8 @@ INSTALL_FILES = h5_write.c h5_read.c h5_extend_write.c h5_chunk_read.c   \
 
 INSTALL_SCRIPT_FILES = run-c-ex.sh
 
-INSTALL_TOP_SCRIPT_FILES = run-all-ex.sh
+INSTALL_TOP_SCRIPT_FILES = run-all-ex.sh 
+INSTALL_TOP_FILES = README
 
 # How to build examples, using installed version of h5cc
 if BUILD_PARALLEL_CONDITIONAL
diff --git a/examples/Makefile.in b/examples/Makefile.in
index fa667ef..cc85e27 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -54,7 +54,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/run-c-ex.sh.in $(srcdir)/testh5cc.sh.in \
 	$(top_srcdir)/config/commence.am \
 	$(top_srcdir)/config/conclude.am \
@@ -364,7 +364,8 @@ INSTALL_FILES = h5_write.c h5_read.c h5_extend_write.c h5_chunk_read.c   \
           h5_ref2reg.c h5_shared_mesg.c ph5example.c
 
 INSTALL_SCRIPT_FILES = run-c-ex.sh
-INSTALL_TOP_SCRIPT_FILES = run-all-ex.sh
+INSTALL_TOP_SCRIPT_FILES = run-all-ex.sh 
+INSTALL_TOP_FILES = README
 
 # The external link examples demonstrate how to use paths; they need
 # directories to be created to do this.
@@ -659,42 +660,52 @@ uninstall-local:
 	@$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
 
 install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) 
-	@for f in X $(INSTALL_FILES); do                                     \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);\
-	  fi;                                                                \
+	@for f in X $(INSTALL_FILES); do                                       \
+	  if test $$f != X; then                                               \
+	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);      \
+            chmod a-x $(EXAMPLEDIR)/$$f;                                       \
+	  fi;                                                                  \
 	done
-	@for f in X $(INSTALL_SCRIPT_FILES); do                                   \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $$f $(EXAMPLEDIR)/. || exit 1);\
-	  fi;                                                                \
+	@for f in X $(INSTALL_SCRIPT_FILES); do                                \
+	  if test $$f != X; then                                               \
+	    (set -x; $(INSTALL) $$f $(EXAMPLEDIR)/. || exit 1);                \
+	  fi;                                                                  \
 	done
-	@for f in X $(INSTALL_TOP_SCRIPT_FILES); do                       \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1); \
-	  fi;                                                                \
+	@for f in X $(INSTALL_TOP_FILES); do                                   \
+	  if test $$f != X; then                                               \
+	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1);   \
+            chmod a-x $(EXAMPLETOPDIR)/$$f;\
+	  fi;                                                                  \
+	done
+	@for f in X $(INSTALL_TOP_SCRIPT_FILES); do                            \
+	  if test $$f != X; then                                               \
+	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1);   \
+	  fi;                                                                  \
 	done
 
 uninstall-examples:
-	@if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then             \
-	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_FILES);                \
+	@if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then               \
+	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_FILES);                  \
+        fi
+	@if test -n "$(INSTALL_SCRIPT_FILES)" -a -d $(EXAMPLEDIR); then        \
+	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_SCRIPT_FILES);           \
         fi
-	@if test -n "$(INSTALL_SCRIPT_FILES)" -a -d $(EXAMPLEDIR); then           \
-	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_SCRIPT_FILES);              \
+	@if test -n "$(INSTALL_TOP_FILES)" -a -d $(EXAMPLETOPDIR); then        \
+	  set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_FILES);           \
         fi
-	@if test -n "$(INSTALL_TOP_SCRIPT_FILES)" -a -d $(EXAMPLETOPDIR); then    \
-	  set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_SCRIPT_FILES);       \
+	@if test -n "$(INSTALL_TOP_SCRIPT_FILES)" -a -d $(EXAMPLETOPDIR); then \
+	  set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_SCRIPT_FILES);    \
         fi
 
 installcheck-local:
-	@if test "$(STATIC_SHARED)" = "static, shared"; then               \
-	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                \
-	  $(MAKE) $(AM_MAKEFLAGS) clean;                                   \
-	  H5CCFLAGS="" $(MAKE) $(AM_MAKEFLAGS) check;                      \
-	 elif test "$(STATIC_SHARED)" = "shared"; then                     \
-	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                \
-	 else                                                              \
-	  $(MAKE) $(AM_MAKEFLAGS) check;                                   \
+	@if test "$(STATIC_SHARED)" = "static, shared"; then                   \
+	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                    \
+	  $(MAKE) $(AM_MAKEFLAGS) clean;                                       \
+	  H5CCFLAGS="" $(MAKE) $(AM_MAKEFLAGS) check;                          \
+	 elif test "$(STATIC_SHARED)" = "shared"; then                         \
+	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                    \
+	 else                                                                  \
+	  $(MAKE) $(AM_MAKEFLAGS) check;                                       \
 	 fi
 
 # lib/progs/tests targets recurse into subdirectories. build-* targets
diff --git a/examples/README b/examples/README
new file mode 100644
index 0000000..0550b15
--- /dev/null
+++ b/examples/README
@@ -0,0 +1,17 @@
+                               HDF5 Examples
+
+This directory contains example programs for the installed APIs and scripts to 
+compile and run them.  Examples in the c and hl/c subdirectories are always 
+installed, and those in fortan, hl/fortran, c++ and hl/c++ will be installed 
+when fortran or c++ are enabled.
+
+Running the run-all-ex.sh script in this directory will run the scripts and in 
+turn the examples in all the subdirectories where examples are installed.  The 
+scripts can also be run individually.  The appropriate compile scripts in the 
+bin directory for this install will be used by default to compile and link the 
+example programs.  Note that h5redeploy must be run if these binaries are 
+copied or extracted in a directory other than the one where they were initially 
+installed.  Compile scripts from other locations can be used by setting an 
+environment variable prefix to the path of the directory containing the bin 
+directory with the compile scripts h5cc, h5fc, etc.  For example, export 
+prefix=/usr/local/hdf5 to use h5cc, h5fc, etc. in /usr/local/hdf5/bin.  
diff --git a/examples/run-all-ex.sh b/examples/run-all-ex.sh
index 6837c7e..3867eb3 100755
--- a/examples/run-all-ex.sh
+++ b/examples/run-all-ex.sh
@@ -20,12 +20,18 @@
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 #                                                                               #
 # This script will run the scripts to compile and run the installed hdf5        #
-# examples.                                                                     #
+# examples.  By default the compile scripts h5cc, h5fc, and h5c++ with which    #
+# these examples are installed will be used to compile them.  It is also        #
+# possible to use a different set of compile scripts by setting the environment #
+# variable prefix to the path to the directory containing the bin directory     #
+# with the desired alternative compile scripts.  For example, if using compile  #
+# scripts installed in /usr/local/hdf5/bin is desired, set the environment      #
+# prefix to /usr/local/hdf5/                                                    #
 #                                                                               #
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 
-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 2bc1cd4..541bdbf 100755
--- a/examples/run-c-ex.sh.in
+++ b/examples/run-c-ex.sh.in
@@ -33,7 +33,7 @@ EXIT_FAILURE=1
  
 # Where the tool is installed.
 # Note: no '/' after DESTDIR.  Explanation in commence.am
-prefix="${prefix:-${DESTDIR}@prefix@}"
+prefix="${prefix:-../../../}"
 PARALLEL=@PARALLEL@             # Am I in parallel mode?
 AR="@AR@"
 RANLIB="@RANLIB@"
diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in
index b102e5c..575a227 100644
--- a/fortran/examples/Makefile.in
+++ b/fortran/examples/Makefile.in
@@ -655,42 +655,52 @@ uninstall-local:
 	@$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
 
 install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) 
-	@for f in X $(INSTALL_FILES); do                                     \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);\
-	  fi;                                                                \
+	@for f in X $(INSTALL_FILES); do                                       \
+	  if test $$f != X; then                                               \
+	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);      \
+            chmod a-x $(EXAMPLEDIR)/$$f;                                       \
+	  fi;                                                                  \
 	done
-	@for f in X $(INSTALL_SCRIPT_FILES); do                                   \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $$f $(EXAMPLEDIR)/. || exit 1);\
-	  fi;                                                                \
+	@for f in X $(INSTALL_SCRIPT_FILES); do                                \
+	  if test $$f != X; then                                               \
+	    (set -x; $(INSTALL) $$f $(EXAMPLEDIR)/. || exit 1);                \
+	  fi;                                                                  \
 	done
-	@for f in X $(INSTALL_TOP_SCRIPT_FILES); do                       \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1); \
-	  fi;                                                                \
+	@for f in X $(INSTALL_TOP_FILES); do                                   \
+	  if test $$f != X; then                                               \
+	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1);   \
+            chmod a-x $(EXAMPLETOPDIR)/$$f;\
+	  fi;                                                                  \
+	done
+	@for f in X $(INSTALL_TOP_SCRIPT_FILES); do                            \
+	  if test $$f != X; then                                               \
+	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1);   \
+	  fi;                                                                  \
 	done
 
 uninstall-examples:
-	@if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then             \
-	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_FILES);                \
+	@if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then               \
+	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_FILES);                  \
+        fi
+	@if test -n "$(INSTALL_SCRIPT_FILES)" -a -d $(EXAMPLEDIR); then        \
+	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_SCRIPT_FILES);           \
         fi
-	@if test -n "$(INSTALL_SCRIPT_FILES)" -a -d $(EXAMPLEDIR); then           \
-	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_SCRIPT_FILES);              \
+	@if test -n "$(INSTALL_TOP_FILES)" -a -d $(EXAMPLETOPDIR); then        \
+	  set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_FILES);           \
         fi
-	@if test -n "$(INSTALL_TOP_SCRIPT_FILES)" -a -d $(EXAMPLETOPDIR); then    \
-	  set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_SCRIPT_FILES);       \
+	@if test -n "$(INSTALL_TOP_SCRIPT_FILES)" -a -d $(EXAMPLETOPDIR); then \
+	  set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_SCRIPT_FILES);    \
         fi
 
 installcheck-local:
-	@if test "$(STATIC_SHARED)" = "static, shared"; then               \
-	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                \
-	  $(MAKE) $(AM_MAKEFLAGS) clean;                                   \
-	  H5CCFLAGS="" $(MAKE) $(AM_MAKEFLAGS) check;                      \
-	 elif test "$(STATIC_SHARED)" = "shared"; then                     \
-	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                \
-	 else                                                              \
-	  $(MAKE) $(AM_MAKEFLAGS) check;                                   \
+	@if test "$(STATIC_SHARED)" = "static, shared"; then                   \
+	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                    \
+	  $(MAKE) $(AM_MAKEFLAGS) clean;                                       \
+	  H5CCFLAGS="" $(MAKE) $(AM_MAKEFLAGS) check;                          \
+	 elif test "$(STATIC_SHARED)" = "shared"; then                         \
+	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                    \
+	 else                                                                  \
+	  $(MAKE) $(AM_MAKEFLAGS) check;                                       \
 	 fi
 
 # lib/progs/tests targets recurse into subdirectories. build-* targets
diff --git a/fortran/examples/run-fortran-ex.sh.in b/fortran/examples/run-fortran-ex.sh.in
index b29eaaf..b920e64 100755
--- a/fortran/examples/run-fortran-ex.sh.in
+++ b/fortran/examples/run-fortran-ex.sh.in
@@ -34,7 +34,7 @@ EXIT_FAILURE=1
 
 # Where the tool is installed.
 # Note: no '/' after DESTDIR.  Explanation in commence.am
-prefix="${prefix:-${DESTDIR}@prefix@}"
+prefix="${prefix:-../../../}"
 PARALLEL=@PARALLEL@             # Am I in parallel mode?
 AR="@AR@"
 RANLIB="@RANLIB@"
diff --git a/hl/c++/examples/Makefile.am b/hl/c++/examples/Makefile.am
index c690a12..f909515 100644
--- a/hl/c++/examples/Makefile.am
+++ b/hl/c++/examples/Makefile.am
@@ -26,7 +26,7 @@ include $(top_srcdir)/config/commence.am
 TEST_PROG=ptExampleFL ptExampleVL
 
 # These are the example files to be installed
-INSTALL_FILES=ptExampleFL.cpp ptExampleVL.cpp
+INSTALL_FILES=ptExampleFL.cpp 
 INSTALL_SCRIPT_FILES = run-hlc++-ex.sh
 
 # Tell conclude.am that these are C++ tests.
diff --git a/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in
index 1982a5e..7769511 100644
--- a/hl/c++/examples/Makefile.in
+++ b/hl/c++/examples/Makefile.in
@@ -349,7 +349,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5
 TEST_PROG = ptExampleFL ptExampleVL
 
 # These are the example files to be installed
-INSTALL_FILES = ptExampleFL.cpp ptExampleVL.cpp
+INSTALL_FILES = ptExampleFL.cpp 
 INSTALL_SCRIPT_FILES = run-hlc++-ex.sh
 
 # Tell conclude.am that these are C++ tests.
@@ -612,42 +612,52 @@ uninstall-local:
 	@$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
 
 install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) 
-	@for f in X $(INSTALL_FILES); do                                     \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);\
-	  fi;                                                                \
+	@for f in X $(INSTALL_FILES); do                                       \
+	  if test $$f != X; then                                               \
+	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);      \
+            chmod a-x $(EXAMPLEDIR)/$$f;                                       \
+	  fi;                                                                  \
 	done
-	@for f in X $(INSTALL_SCRIPT_FILES); do                                   \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $$f $(EXAMPLEDIR)/. || exit 1);\
-	  fi;                                                                \
+	@for f in X $(INSTALL_SCRIPT_FILES); do                                \
+	  if test $$f != X; then                                               \
+	    (set -x; $(INSTALL) $$f $(EXAMPLEDIR)/. || exit 1);                \
+	  fi;                                                                  \
 	done
-	@for f in X $(INSTALL_TOP_SCRIPT_FILES); do                       \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1); \
-	  fi;                                                                \
+	@for f in X $(INSTALL_TOP_FILES); do                                   \
+	  if test $$f != X; then                                               \
+	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1);   \
+            chmod a-x $(EXAMPLETOPDIR)/$$f;\
+	  fi;                                                                  \
+	done
+	@for f in X $(INSTALL_TOP_SCRIPT_FILES); do                            \
+	  if test $$f != X; then                                               \
+	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1);   \
+	  fi;                                                                  \
 	done
 
 uninstall-examples:
-	@if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then             \
-	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_FILES);                \
+	@if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then               \
+	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_FILES);                  \
+        fi
+	@if test -n "$(INSTALL_SCRIPT_FILES)" -a -d $(EXAMPLEDIR); then        \
+	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_SCRIPT_FILES);           \
         fi
-	@if test -n "$(INSTALL_SCRIPT_FILES)" -a -d $(EXAMPLEDIR); then           \
-	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_SCRIPT_FILES);              \
+	@if test -n "$(INSTALL_TOP_FILES)" -a -d $(EXAMPLETOPDIR); then        \
+	  set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_FILES);           \
         fi
-	@if test -n "$(INSTALL_TOP_SCRIPT_FILES)" -a -d $(EXAMPLETOPDIR); then    \
-	  set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_SCRIPT_FILES);       \
+	@if test -n "$(INSTALL_TOP_SCRIPT_FILES)" -a -d $(EXAMPLETOPDIR); then \
+	  set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_SCRIPT_FILES);    \
         fi
 
 installcheck-local:
-	@if test "$(STATIC_SHARED)" = "static, shared"; then               \
-	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                \
-	  $(MAKE) $(AM_MAKEFLAGS) clean;                                   \
-	  H5CCFLAGS="" $(MAKE) $(AM_MAKEFLAGS) check;                      \
-	 elif test "$(STATIC_SHARED)" = "shared"; then                     \
-	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                \
-	 else                                                              \
-	  $(MAKE) $(AM_MAKEFLAGS) check;                                   \
+	@if test "$(STATIC_SHARED)" = "static, shared"; then                   \
+	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                    \
+	  $(MAKE) $(AM_MAKEFLAGS) clean;                                       \
+	  H5CCFLAGS="" $(MAKE) $(AM_MAKEFLAGS) check;                          \
+	 elif test "$(STATIC_SHARED)" = "shared"; then                         \
+	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                    \
+	 else                                                                  \
+	  $(MAKE) $(AM_MAKEFLAGS) check;                                       \
 	 fi
 
 # lib/progs/tests targets recurse into subdirectories. build-* targets
diff --git a/hl/c++/examples/run-hlc++-ex.sh.in b/hl/c++/examples/run-hlc++-ex.sh.in
index d43606e..06db805 100755
--- a/hl/c++/examples/run-hlc++-ex.sh.in
+++ b/hl/c++/examples/run-hlc++-ex.sh.in
@@ -26,14 +26,9 @@
 # use data files created by earlier test programs.  Any future additions should #
 # be placed accordingly.                                                        #
 #                                                                               #
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-
-# Initializations
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
 # Where the tool is installed.
 # Note: no '/' after DESTDIR.  Explanation in commence.am
-prefix="${prefix:-${DESTDIR}@prefix@}"
+prefix="${prefix:-../../../../}"
 AR="@AR@"
 RANLIB="@RANLIB@"
 H5TOOL="h5c++"                  # The tool name
@@ -62,8 +57,7 @@ RunTest()
 # Run tests
 if [ $? -eq 0 ]
 then
-    if (RunTest ptExampleFL &&\
-        RunTest ptExampleVL); then
+    if (RunTest ptExampleFL); then
         EXIT_VALUE=${EXIT_SUCCESS}
     else
         EXIT_VALUE=${EXIT_FAILURE}
diff --git a/hl/examples/Makefile.am b/hl/examples/Makefile.am
index d1f67bc..9893fd5 100644
--- a/hl/examples/Makefile.am
+++ b/hl/examples/Makefile.am
@@ -43,7 +43,7 @@ TEST_PROG = ex_lite1 ex_lite2 ex_lite3 ptExampleFL ptExampleVL \
 
 # Install files
 # List all file that should be installed in examples directory
-INSTALL_FILES = ex_lite1.c ex_lite2.c ex_lite3.c ptExampleFL.c ptExampleVL.c \
+INSTALL_FILES = ex_lite1.c ex_lite2.c ex_lite3.c ptExampleFL.c \
                 ex_image1.c ex_image2.c \
                 ex_table_01.c ex_table_02.c ex_table_03.c ex_table_04.c      \
                 ex_table_05.c ex_table_06.c ex_table_07.c ex_table_08.c      \
diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in
index 60345e4..9dabd36 100644
--- a/hl/examples/Makefile.in
+++ b/hl/examples/Makefile.in
@@ -364,7 +364,7 @@ TEST_PROG = ex_lite1 ex_lite2 ex_lite3 ptExampleFL ptExampleVL \
 
 # Install files
 # List all file that should be installed in examples directory
-INSTALL_FILES = ex_lite1.c ex_lite2.c ex_lite3.c ptExampleFL.c ptExampleVL.c \
+INSTALL_FILES = ex_lite1.c ex_lite2.c ex_lite3.c ptExampleFL.c \
                 ex_image1.c ex_image2.c \
                 ex_table_01.c ex_table_02.c ex_table_03.c ex_table_04.c      \
                 ex_table_05.c ex_table_06.c ex_table_07.c ex_table_08.c      \
@@ -653,42 +653,52 @@ uninstall-local:
 	@$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
 
 install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) 
-	@for f in X $(INSTALL_FILES); do                                     \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);\
-	  fi;                                                                \
+	@for f in X $(INSTALL_FILES); do                                       \
+	  if test $$f != X; then                                               \
+	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);      \
+            chmod a-x $(EXAMPLEDIR)/$$f;                                       \
+	  fi;                                                                  \
 	done
-	@for f in X $(INSTALL_SCRIPT_FILES); do                                   \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $$f $(EXAMPLEDIR)/. || exit 1);\
-	  fi;                                                                \
+	@for f in X $(INSTALL_SCRIPT_FILES); do                                \
+	  if test $$f != X; then                                               \
+	    (set -x; $(INSTALL) $$f $(EXAMPLEDIR)/. || exit 1);                \
+	  fi;                                                                  \
 	done
-	@for f in X $(INSTALL_TOP_SCRIPT_FILES); do                       \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1); \
-	  fi;                                                                \
+	@for f in X $(INSTALL_TOP_FILES); do                                   \
+	  if test $$f != X; then                                               \
+	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1);   \
+            chmod a-x $(EXAMPLETOPDIR)/$$f;\
+	  fi;                                                                  \
+	done
+	@for f in X $(INSTALL_TOP_SCRIPT_FILES); do                            \
+	  if test $$f != X; then                                               \
+	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1);   \
+	  fi;                                                                  \
 	done
 
 uninstall-examples:
-	@if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then             \
-	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_FILES);                \
+	@if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then               \
+	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_FILES);                  \
+        fi
+	@if test -n "$(INSTALL_SCRIPT_FILES)" -a -d $(EXAMPLEDIR); then        \
+	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_SCRIPT_FILES);           \
         fi
-	@if test -n "$(INSTALL_SCRIPT_FILES)" -a -d $(EXAMPLEDIR); then           \
-	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_SCRIPT_FILES);              \
+	@if test -n "$(INSTALL_TOP_FILES)" -a -d $(EXAMPLETOPDIR); then        \
+	  set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_FILES);           \
         fi
-	@if test -n "$(INSTALL_TOP_SCRIPT_FILES)" -a -d $(EXAMPLETOPDIR); then    \
-	  set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_SCRIPT_FILES);       \
+	@if test -n "$(INSTALL_TOP_SCRIPT_FILES)" -a -d $(EXAMPLETOPDIR); then \
+	  set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_SCRIPT_FILES);    \
         fi
 
 installcheck-local:
-	@if test "$(STATIC_SHARED)" = "static, shared"; then               \
-	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                \
-	  $(MAKE) $(AM_MAKEFLAGS) clean;                                   \
-	  H5CCFLAGS="" $(MAKE) $(AM_MAKEFLAGS) check;                      \
-	 elif test "$(STATIC_SHARED)" = "shared"; then                     \
-	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                \
-	 else                                                              \
-	  $(MAKE) $(AM_MAKEFLAGS) check;                                   \
+	@if test "$(STATIC_SHARED)" = "static, shared"; then                   \
+	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                    \
+	  $(MAKE) $(AM_MAKEFLAGS) clean;                                       \
+	  H5CCFLAGS="" $(MAKE) $(AM_MAKEFLAGS) check;                          \
+	 elif test "$(STATIC_SHARED)" = "shared"; then                         \
+	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                    \
+	 else                                                                  \
+	  $(MAKE) $(AM_MAKEFLAGS) check;                                       \
 	 fi
 
 # lib/progs/tests targets recurse into subdirectories. build-* targets
diff --git a/hl/examples/run-hlc-ex.sh.in b/hl/examples/run-hlc-ex.sh.in
index 86c6276..b504720 100755
--- a/hl/examples/run-hlc-ex.sh.in
+++ b/hl/examples/run-hlc-ex.sh.in
@@ -33,7 +33,7 @@ EXIT_FAILURE=1
 
 # Where the tool is installed.
 # Note: no '/' after DESTDIR.  Explanation in commence.am
-prefix="${prefix:-${DESTDIR}@prefix@}"
+prefix="${prefix:-../../../../}"
 PARALLEL=@PARALLEL@             # Am I in parallel mode?
 AR="@AR@"
 RANLIB="@RANLIB@"
@@ -71,7 +71,6 @@ then
         RunTest ex_lite2 &&\
         RunTest ex_lite3 &&\
         RunTest ptExampleFL &&\
-        RunTest ptExampleVL &&\
         RunTest ex_image1 &&\
         RunTest ex_image2 &&\
         RunTest ex_table_01 &&\
diff --git a/hl/fortran/examples/Makefile.in b/hl/fortran/examples/Makefile.in
index 8ad2af4..f813411 100644
--- a/hl/fortran/examples/Makefile.in
+++ b/hl/fortran/examples/Makefile.in
@@ -614,42 +614,52 @@ uninstall-local:
 	@$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
 
 install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) 
-	@for f in X $(INSTALL_FILES); do                                     \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);\
-	  fi;                                                                \
+	@for f in X $(INSTALL_FILES); do                                       \
+	  if test $$f != X; then                                               \
+	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);      \
+            chmod a-x $(EXAMPLEDIR)/$$f;                                       \
+	  fi;                                                                  \
 	done
-	@for f in X $(INSTALL_SCRIPT_FILES); do                                   \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $$f $(EXAMPLEDIR)/. || exit 1);\
-	  fi;                                                                \
+	@for f in X $(INSTALL_SCRIPT_FILES); do                                \
+	  if test $$f != X; then                                               \
+	    (set -x; $(INSTALL) $$f $(EXAMPLEDIR)/. || exit 1);                \
+	  fi;                                                                  \
 	done
-	@for f in X $(INSTALL_TOP_SCRIPT_FILES); do                       \
-	  if test $$f != X; then                                             \
-	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1); \
-	  fi;                                                                \
+	@for f in X $(INSTALL_TOP_FILES); do                                   \
+	  if test $$f != X; then                                               \
+	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1);   \
+            chmod a-x $(EXAMPLETOPDIR)/$$f;\
+	  fi;                                                                  \
+	done
+	@for f in X $(INSTALL_TOP_SCRIPT_FILES); do                            \
+	  if test $$f != X; then                                               \
+	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1);   \
+	  fi;                                                                  \
 	done
 
 uninstall-examples:
-	@if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then             \
-	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_FILES);                \
+	@if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then               \
+	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_FILES);                  \
+        fi
+	@if test -n "$(INSTALL_SCRIPT_FILES)" -a -d $(EXAMPLEDIR); then        \
+	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_SCRIPT_FILES);           \
         fi
-	@if test -n "$(INSTALL_SCRIPT_FILES)" -a -d $(EXAMPLEDIR); then           \
-	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_SCRIPT_FILES);              \
+	@if test -n "$(INSTALL_TOP_FILES)" -a -d $(EXAMPLETOPDIR); then        \
+	  set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_FILES);           \
         fi
-	@if test -n "$(INSTALL_TOP_SCRIPT_FILES)" -a -d $(EXAMPLETOPDIR); then    \
-	  set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_SCRIPT_FILES);       \
+	@if test -n "$(INSTALL_TOP_SCRIPT_FILES)" -a -d $(EXAMPLETOPDIR); then \
+	  set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_SCRIPT_FILES);    \
         fi
 
 installcheck-local:
-	@if test "$(STATIC_SHARED)" = "static, shared"; then               \
-	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                \
-	  $(MAKE) $(AM_MAKEFLAGS) clean;                                   \
-	  H5CCFLAGS="" $(MAKE) $(AM_MAKEFLAGS) check;                      \
-	 elif test "$(STATIC_SHARED)" = "shared"; then                     \
-	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                \
-	 else                                                              \
-	  $(MAKE) $(AM_MAKEFLAGS) check;                                   \
+	@if test "$(STATIC_SHARED)" = "static, shared"; then                   \
+	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                    \
+	  $(MAKE) $(AM_MAKEFLAGS) clean;                                       \
+	  H5CCFLAGS="" $(MAKE) $(AM_MAKEFLAGS) check;                          \
+	 elif test "$(STATIC_SHARED)" = "shared"; then                         \
+	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                    \
+	 else                                                                  \
+	  $(MAKE) $(AM_MAKEFLAGS) check;                                       \
 	 fi
 
 # lib/progs/tests targets recurse into subdirectories. build-* targets
diff --git a/hl/fortran/examples/run-hlfortran-ex.sh.in b/hl/fortran/examples/run-hlfortran-ex.sh.in
index 364b438..2f38f44 100755
--- a/hl/fortran/examples/run-hlfortran-ex.sh.in
+++ b/hl/fortran/examples/run-hlfortran-ex.sh.in
@@ -34,7 +34,7 @@ EXIT_FAILURE=1
 
 # Where the tool is installed.
 # Note: no '/' after DESTDIR.  Explanation in commence.am
-prefix="${prefix:-${DESTDIR}@prefix@}"
+prefix="${prefix:-../../../../}"
 PARALLEL=@PARALLEL@             # Am I in parallel mode?
 AR="@AR@"
 RANLIB="@RANLIB@"