diff --git a/Makefile.in b/Makefile.in
index 00a68de55..525735983 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -358,10 +358,10 @@ config.h: stamp-h1
 stamp-h1: $(srcdir)/config.hin $(top_builddir)/config.status
 	@rm -f stamp-h1
 	cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/$(srcdir)/config.hin:  $(am__configure_deps) 
+$(srcdir)/config.hin:  $(am__configure_deps) 
 	cd $(top_srcdir) && $(AUTOHEADER)
 	rm -f stamp-h1
-	touch $(srcdir)/$(srcdir)/config.hin
+	touch $@
 
 distclean-hdr:
 	-rm -f config.h stamp-h1
diff --git a/aclocal.m4 b/aclocal.m4
index ecfe6b18d..be4672e07 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.7h -*- Autoconf -*-
+# generated automatically by aclocal 1.8 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
@@ -13,6 +13,7 @@
 
 #                                                        -*- Autoconf -*-
 # Copyright (C) 2002, 2003  Free Software Foundation, Inc.
+# Generated from amversion.in; do not edit by hand.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -32,14 +33,14 @@
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.7h"])
+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"])
 
 # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------
 # Call AM_AUTOMAKE_VERSION so it can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.7h])])
+	 [AM_AUTOMAKE_VERSION([1.8])])
 
 # AM_AUX_DIR_EXPAND
 
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 9a20fb49f..84252bac5 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 9a590bb2b..14c2b4fc5 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/m4/Makefile.in b/m4/Makefile.in
index 7caf7579b..4aaa9fb2d 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/man/Makefile.in b/man/Makefile.in
index f03ad2b35..9df6521a9 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/src/Makefile.in b/src/Makefile.in
index 1bb1e6283..54be93892 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 7f86e4db4..ef3313287 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/basename/Makefile.in b/tests/basename/Makefile.in
index 6770d2906..9b2743086 100644
--- a/tests/basename/Makefile.in
+++ b/tests/basename/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/chgrp/Makefile.in b/tests/chgrp/Makefile.in
index b47e5a7d0..abd7ab21d 100644
--- a/tests/chgrp/Makefile.in
+++ b/tests/chgrp/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/chmod/Makefile.in b/tests/chmod/Makefile.in
index b8520d8b1..de58f450d 100644
--- a/tests/chmod/Makefile.in
+++ b/tests/chmod/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/chown/Makefile.in b/tests/chown/Makefile.in
index 33c5143a2..0de73f627 100644
--- a/tests/chown/Makefile.in
+++ b/tests/chown/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/cp/Makefile.in b/tests/cp/Makefile.in
index d659b6353..404ed7fac 100644
--- a/tests/cp/Makefile.in
+++ b/tests/cp/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/cut/Makefile.in b/tests/cut/Makefile.in
index b82b712bd..407599e12 100644
--- a/tests/cut/Makefile.in
+++ b/tests/cut/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/date/Makefile.in b/tests/date/Makefile.in
index 4ed26662b..37bbc69d6 100644
--- a/tests/date/Makefile.in
+++ b/tests/date/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/dd/Makefile.in b/tests/dd/Makefile.in
index e942768b5..3e86076dd 100644
--- a/tests/dd/Makefile.in
+++ b/tests/dd/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/dircolors/Makefile.in b/tests/dircolors/Makefile.in
index 3849658e6..8791ccfe7 100644
--- a/tests/dircolors/Makefile.in
+++ b/tests/dircolors/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/du/Makefile.in b/tests/du/Makefile.in
index c1f0694e3..9415001b8 100644
--- a/tests/du/Makefile.in
+++ b/tests/du/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/expr/Makefile.in b/tests/expr/Makefile.in
index 1bd8921c0..d104d52ef 100644
--- a/tests/expr/Makefile.in
+++ b/tests/expr/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/factor/Makefile.in b/tests/factor/Makefile.in
index 5cf53bf11..2b069d06a 100644
--- a/tests/factor/Makefile.in
+++ b/tests/factor/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/fmt/Makefile.in b/tests/fmt/Makefile.in
index e032782ee..b5e14144a 100644
--- a/tests/fmt/Makefile.in
+++ b/tests/fmt/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/head/Makefile.in b/tests/head/Makefile.in
index dc288ca8c..ccf904769 100644
--- a/tests/head/Makefile.in
+++ b/tests/head/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/install/Makefile.in b/tests/install/Makefile.in
index bbe389313..f16b957da 100644
--- a/tests/install/Makefile.in
+++ b/tests/install/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/join/Makefile.in b/tests/join/Makefile.in
index fd127481e..f53608f40 100644
--- a/tests/join/Makefile.in
+++ b/tests/join/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/ln/Makefile.in b/tests/ln/Makefile.in
index cc1d5c9ba..1a50377d5 100644
--- a/tests/ln/Makefile.in
+++ b/tests/ln/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/ls-2/Makefile.in b/tests/ls-2/Makefile.in
index 738d619a1..f26752c5c 100644
--- a/tests/ls-2/Makefile.in
+++ b/tests/ls-2/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/ls/Makefile.in b/tests/ls/Makefile.in
index ac706c7d3..fee46fae6 100644
--- a/tests/ls/Makefile.in
+++ b/tests/ls/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/md5sum/Makefile.in b/tests/md5sum/Makefile.in
index ee926139d..d005936e3 100644
--- a/tests/md5sum/Makefile.in
+++ b/tests/md5sum/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/misc/Makefile.in b/tests/misc/Makefile.in
index af2105be7..30f072b12 100644
--- a/tests/misc/Makefile.in
+++ b/tests/misc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/mkdir/Makefile.in b/tests/mkdir/Makefile.in
index 010016f83..054662eb2 100644
--- a/tests/mkdir/Makefile.in
+++ b/tests/mkdir/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/mv/Makefile.in b/tests/mv/Makefile.in
index 04b98decf..ec20cc8b6 100644
--- a/tests/mv/Makefile.in
+++ b/tests/mv/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/od/Makefile.in b/tests/od/Makefile.in
index e4138c5fd..b2c69b059 100644
--- a/tests/od/Makefile.in
+++ b/tests/od/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/pr/Makefile.in b/tests/pr/Makefile.in
index 7c4f407c2..97693d7c3 100644
--- a/tests/pr/Makefile.in
+++ b/tests/pr/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/rm/Makefile.in b/tests/rm/Makefile.in
index 8a4ea2795..ddaa01529 100644
--- a/tests/rm/Makefile.in
+++ b/tests/rm/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/rmdir/Makefile.in b/tests/rmdir/Makefile.in
index f52ba7e80..84ada292b 100644
--- a/tests/rmdir/Makefile.in
+++ b/tests/rmdir/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/seq/Makefile.in b/tests/seq/Makefile.in
index 5100fedd8..1526e1045 100644
--- a/tests/seq/Makefile.in
+++ b/tests/seq/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/sha1sum/Makefile.in b/tests/sha1sum/Makefile.in
index c96465297..47cc00b6c 100644
--- a/tests/sha1sum/Makefile.in
+++ b/tests/sha1sum/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/shred/Makefile.in b/tests/shred/Makefile.in
index b1505a1e8..da621f1fc 100644
--- a/tests/shred/Makefile.in
+++ b/tests/shred/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/sort/Makefile.in b/tests/sort/Makefile.in
index 909bac1f7..e2b6fbd38 100644
--- a/tests/sort/Makefile.in
+++ b/tests/sort/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/stty/Makefile.in b/tests/stty/Makefile.in
index 466f97626..44bd7d0bb 100644
--- a/tests/stty/Makefile.in
+++ b/tests/stty/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/sum/Makefile.in b/tests/sum/Makefile.in
index 82f5d22e7..d8553b74d 100644
--- a/tests/sum/Makefile.in
+++ b/tests/sum/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/tac/Makefile.in b/tests/tac/Makefile.in
index 299f4d9ae..f9cbf905b 100644
--- a/tests/tac/Makefile.in
+++ b/tests/tac/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/tail-2/Makefile.in b/tests/tail-2/Makefile.in
index 0a8381c75..bce75c562 100644
--- a/tests/tail-2/Makefile.in
+++ b/tests/tail-2/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/tail/Makefile.in b/tests/tail/Makefile.in
index 98d729463..9655c69aa 100644
--- a/tests/tail/Makefile.in
+++ b/tests/tail/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/test/Makefile.in b/tests/test/Makefile.in
index dc101ad5b..d3d63c885 100644
--- a/tests/test/Makefile.in
+++ b/tests/test/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/touch/Makefile.in b/tests/touch/Makefile.in
index f781d4d49..674a096a7 100644
--- a/tests/touch/Makefile.in
+++ b/tests/touch/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/tr/Makefile.in b/tests/tr/Makefile.in
index 236d61183..b4b28c6d2 100644
--- a/tests/tr/Makefile.in
+++ b/tests/tr/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/tsort/Makefile.in b/tests/tsort/Makefile.in
index 2e4eab292..8ab2c6a89 100644
--- a/tests/tsort/Makefile.in
+++ b/tests/tsort/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/unexpand/Makefile.in b/tests/unexpand/Makefile.in
index f2dd89864..e72a6b2ba 100644
--- a/tests/unexpand/Makefile.in
+++ b/tests/unexpand/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/uniq/Makefile.in b/tests/uniq/Makefile.in
index 25741aaee..fa6a76b5a 100644
--- a/tests/uniq/Makefile.in
+++ b/tests/uniq/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/tests/wc/Makefile.in b/tests/wc/Makefile.in
index b948757e5..09113090a 100644
--- a/tests/wc/Makefile.in
+++ b/tests/wc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7h from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003