4 files changed, 19 insertions, 20 deletions
diff --git a/tools/h5copy/Makefile.am b/tools/h5copy/Makefile.am
index 1848972..dd0c5c3 100644
--- a/tools/h5copy/Makefile.am
+++ b/tools/h5copy/Makefile.am
@@ -34,7 +34,7 @@ bin_PROGRAMS=h5copy
 check_PROGRAMS=$(TEST_PROG)
 
 # Add h5copy specific linker flags here
-h5copy_LDFLAGS = $(LT_STATIC_EXEC)
+h5copy_LDFLAGS = $(LT_STATIC_EXEC) $(AM_LDFLAGS)
 
 # source file for the test file generator
 h5copygentest_SOURCES=h5copygentest.c
diff --git a/tools/h5copy/Makefile.in b/tools/h5copy/Makefile.in
index b582057..d2a8e0d 100644
--- a/tools/h5copy/Makefile.in
+++ b/tools/h5copy/Makefile.in
@@ -103,6 +103,16 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = /home1/packages/automake/automake-1.9.6/bin/aclocal-1.9 -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
 AMTAR = @AMTAR@
+
+# H5_CFLAGS holds flags that should be used when building hdf5,
+# but which should not be exported to h5cc for building other programs.
+# AM_CFLAGS is an automake construct which should be used by Makefiles 
+# instead of CFLAGS, as CFLAGS is reserved solely for the user to define.
+AM_CFLAGS = @AM_CFLAGS@ @H5_CFLAGS@
+AM_CPPFLAGS = @AM_CPPFLAGS@ @H5_CPPFLAGS@
+AM_CXXFLAGS = @AM_CXXFLAGS@ @H5_CXXFLAGS@
+AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@
+AM_LDFLAGS = @AM_LDFLAGS@
 AM_MAKEFLAGS = @AM_MAKEFLAGS@
 AR = @AR@
 
@@ -116,21 +126,18 @@ BYTESEX = @BYTESEX@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CC_VERSION = @CC_VERSION@
-
-# H5_CFLAGS holds flags that should be used as CFLAGS when building hdf5,
-# but which shouldn't be exported to h5cc for building other programs.
-CFLAGS = @CFLAGS@ @H5_CFLAGS@
+CFLAGS = @CFLAGS@
 CLEARFILEBUF = @CLEARFILEBUF@
 CODESTACK = @CODESTACK@
 CONFIG_DATE = @CONFIG_DATE@
 CONFIG_MODE = @CONFIG_MODE@
 CONFIG_USER = @CONFIG_USER@
 CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@ @H5_CPPFLAGS@
+CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFAULT_API_VERSION = @DEFAULT_API_VERSION@
@@ -153,7 +160,7 @@ F9XMODEXT = @F9XMODEXT@
 F9XMODFLAG = @F9XMODFLAG@
 F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
 FC = @FC@
-FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@
+FCFLAGS = @FCFLAGS@
 FCFLAGS_f90 = @FCFLAGS_f90@
 FCLIBS = @FCLIBS@
 FGREP = @FGREP@
@@ -364,7 +371,7 @@ check_SCRIPTS = $(TEST_SCRIPT)
 SCRIPT_DEPEND = h5copy$(EXEEXT)
 
 # Add h5copy specific linker flags here
-h5copy_LDFLAGS = $(LT_STATIC_EXEC)
+h5copy_LDFLAGS = $(LT_STATIC_EXEC) $(AM_LDFLAGS)
 
 # source file for the test file generator
 h5copygentest_SOURCES = h5copygentest.c
diff --git a/tools/h5copy/h5copy.c b/tools/h5copy/h5copy.c
index e487f2e..f2a41ae 100644
--- a/tools/h5copy/h5copy.c
+++ b/tools/h5copy/h5copy.c
@@ -210,7 +210,7 @@ main (int argc, const char *argv[])
  /* Check for no command line parameters */
  if(argc == 1) {
    usage();
-   leave(EXIT_SUCCESS);
+   leave(EXIT_FAILURE);
  } /* end if */
 
  /* parse command line options */
diff --git a/tools/h5copy/testh5copy.sh b/tools/h5copy/testh5copy.sh
index 046440d..b513938 100644
--- a/tools/h5copy/testh5copy.sh
+++ b/tools/h5copy/testh5copy.sh
@@ -166,11 +166,7 @@ TOOLTEST_FAIL()
 H5DIFFTEST() 
 {
     VERIFY  $@
-    if [ "`uname -s`" = "TFLOPS O/S" ]; then
-        $RUNSERIAL $H5DIFF_BIN -q $@ 
-    else
-        $RUNSERIAL $H5DIFF_BIN -q "$@" 
-    fi
+    $RUNSERIAL $H5DIFF_BIN -q "$@" 
     RET=$?
     if [ $RET != 0 ] ; then
          echo "*FAILED*"
@@ -185,11 +181,7 @@ H5DIFFTEST()
 H5DIFFTEST_FAIL() 
 {
     VERIFY  $@
-    if [ "`uname -s`" = "TFLOPS O/S" ]; then
-        $RUNSERIAL $H5DIFF_BIN -q $@ 
-    else
-        $RUNSERIAL $H5DIFF_BIN -q "$@" 
-    fi
+    $RUNSERIAL $H5DIFF_BIN -q "$@" 
     RET=$?
 
     if [ $RET != 1 ] ; then