.

50 files changed, 361 insertions, 341 deletions

diff --git a/Makefile.in b/Makefile.in
index 357776654..2d97778f3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -259,8 +259,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -531,14 +529,12 @@ distdir: $(DISTFILES)
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || mkdir "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="../$(top_distdir)" \
+	        distdir="../$(distdir)/$$subdir" \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -552,14 +548,14 @@ distdir: $(DISTFILES)
 	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r $(distdir)
 dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__remove_distdir)
 dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	$(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
 
 dist-tarZ: distdir
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+	$(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z
 	$(am__remove_distdir)
 
 dist-shar: distdir
@@ -572,8 +568,8 @@ dist-zip: distdir
 	$(am__remove_distdir)
 
 dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
@@ -582,11 +578,11 @@ dist dist-all: distdir
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\
 	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	  bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\
 	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+	  uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
 	*.shar.gz*) \
 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
diff --git a/aclocal.m4 b/aclocal.m4
index d07426850..6e6ad2458 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.8b -*- Autoconf -*-
+# generated automatically by aclocal 1.8.5 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 # Free Software Foundation, Inc.
@@ -33,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.8b"])
+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.8b])])
+	 [AM_AUTOMAKE_VERSION([1.8.5])])
 
 # AM_AUX_DIR_EXPAND
 
@@ -108,7 +108,7 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
 
 # AM_CONDITIONAL                                              -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
 
 # 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
@@ -145,8 +145,8 @@ else
 fi
 AC_CONFIG_COMMANDS_PRE(
 [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
+  AC_MSG_ERROR([conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.])
 fi])])
 
 # serial 7						-*- Autoconf -*-
@@ -319,8 +319,7 @@ AC_SUBST([AMDEPBACKSLASH])
 
 # Generate code to set up dependency tracking.   -*- Autoconf -*-
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
-#   Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
 # 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
@@ -356,21 +355,27 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
   else
     continue
   fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
+  grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
+  # Extract the definition of DEP_FILES from the Makefile without
+  # running `make'.
   DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
   test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
   # When using ansi2knr, U may be empty or an underscore; expand it
   U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
+  # We invoke sed twice because it is the simplest approach to
+  # changing $(DEPDIR) to its actual value in the expansion.
+  for file in `sed -n '
+    /^DEP_FILES = .*\\\\$/ {
+      s/^DEP_FILES = //
+      :loop
+	s/\\\\$//
+	p
+	n
+	/\\\\$/ b loop
+      p
+    }
+    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
     # Make sure the directory exists.
     test -f "$dirpart/$file" && continue
@@ -401,7 +406,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 # This macro actually does too much some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -477,6 +482,7 @@ AM_MISSING_PROG(AUTOCONF, autoconf)
 AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
 AM_MISSING_PROG(AUTOHEADER, autoheader)
 AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_MISSING_PROG(AMTAR, tar)
 AM_PROG_INSTALL_SH
 AM_PROG_INSTALL_STRIP
 AC_REQUIRE([AM_PROG_MKDIR_P])dnl
@@ -485,9 +491,7 @@ AC_REQUIRE([AM_PROG_MKDIR_P])dnl
 AC_REQUIRE([AC_PROG_AWK])dnl
 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
 AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-	      		     [_AM_PROG_TAR([v7])])])
+
 _AM_IF_OPTION([no-dependencies],,
 [AC_PROVIDE_IFELSE([AC_PROG_CC],
                   [_AM_DEPENDENCIES(CC)],
@@ -939,110 +943,6 @@ fi
 INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Check how to create a tarball.                            -*- Autoconf -*-
-
-# Copyright (C) 2004  Free Software Foundation, Inc.
-
-# 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 1
-
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-#     tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-#     $(am__untar) < result.tar
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
-m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-for _am_tool in ${am_cv_prog_tar_$1-gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none}
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
-
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
-
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-  rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
-
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-
 m4_include([m4/acl.m4])
 m4_include([m4/afs.m4])
 m4_include([m4/alloca.m4])
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 126059351..e485087a8 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -256,8 +256,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -324,11 +322,15 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 .texi.info:
-	restore=: && backupdir="$(am__leading_dot)am$$$$" && \
+	restore=: && \
+	backupdir="$(am__leading_dot)am$$$$" && \
 	am__cwd=`pwd` && cd $(srcdir) && \
 	rm -rf $$backupdir && mkdir $$backupdir && \
 	for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
-	  if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \
+	  if test -f $$f; then \
+	    mv $$f $$backupdir; \
+	    restore=mv; \
+	  fi; \
 	done; \
 	cd "$$am__cwd"; \
 	if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
@@ -341,7 +343,8 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	  cd $(srcdir) && \
 	  $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \
 	fi; \
-	rm -rf $$backupdir; exit $$rc
+	rm -rf $$backupdir; \
+	exit $$rc
 
 .texi.dvi:
 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
diff --git a/lib/Makefile.in b/lib/Makefile.in
index d18f62373..53fe2fec4 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -199,6 +199,91 @@ libfetish_a_OBJECTS = $(am_libfetish_a_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/__fpending.Po $(DEPDIR)/alloca.Po \
+@AMDEP_TRUE@	$(DEPDIR)/asnprintf.Po $(DEPDIR)/asprintf.Po \
+@AMDEP_TRUE@	$(DEPDIR)/atexit.Po $(DEPDIR)/calloc.Po \
+@AMDEP_TRUE@	$(DEPDIR)/canonicalize.Po $(DEPDIR)/chown.Po \
+@AMDEP_TRUE@	$(DEPDIR)/dirfd.Po $(DEPDIR)/dup2.Po \
+@AMDEP_TRUE@	$(DEPDIR)/error.Po $(DEPDIR)/euidaccess.Po \
+@AMDEP_TRUE@	$(DEPDIR)/fchdir-stub.Po $(DEPDIR)/fchown-stub.Po \
+@AMDEP_TRUE@	$(DEPDIR)/fileblocks.Po $(DEPDIR)/fnmatch.Po \
+@AMDEP_TRUE@	$(DEPDIR)/free.Po $(DEPDIR)/fsusage.Po \
+@AMDEP_TRUE@	$(DEPDIR)/ftruncate.Po $(DEPDIR)/getcwd.Po \
+@AMDEP_TRUE@	$(DEPDIR)/getgroups.Po $(DEPDIR)/gethostname.Po \
+@AMDEP_TRUE@	$(DEPDIR)/getline.Po $(DEPDIR)/getloadavg.Po \
+@AMDEP_TRUE@	$(DEPDIR)/getndelim2.Po $(DEPDIR)/getpass.Po \
+@AMDEP_TRUE@	$(DEPDIR)/gettimeofday.Po \
+@AMDEP_TRUE@	$(DEPDIR)/getusershell.Po \
+@AMDEP_TRUE@	$(DEPDIR)/group-member.Po $(DEPDIR)/lchown.Po \
+@AMDEP_TRUE@	$(DEPDIR)/lstat.Po $(DEPDIR)/malloc.Po \
+@AMDEP_TRUE@	$(DEPDIR)/memchr.Po $(DEPDIR)/memcmp.Po \
+@AMDEP_TRUE@	$(DEPDIR)/memcpy.Po $(DEPDIR)/memmove.Po \
+@AMDEP_TRUE@	$(DEPDIR)/memrchr.Po $(DEPDIR)/memset.Po \
+@AMDEP_TRUE@	$(DEPDIR)/mkdir.Po $(DEPDIR)/mkstemp.Po \
+@AMDEP_TRUE@	$(DEPDIR)/mktime.Po $(DEPDIR)/mountlist.Po \
+@AMDEP_TRUE@	$(DEPDIR)/nanosleep.Po $(DEPDIR)/obstack.Po \
+@AMDEP_TRUE@	$(DEPDIR)/printf-args.Po $(DEPDIR)/printf-parse.Po \
+@AMDEP_TRUE@	$(DEPDIR)/putenv.Po $(DEPDIR)/raise.Po \
+@AMDEP_TRUE@	$(DEPDIR)/readlink.Po $(DEPDIR)/readutmp.Po \
+@AMDEP_TRUE@	$(DEPDIR)/realloc.Po $(DEPDIR)/regex.Po \
+@AMDEP_TRUE@	$(DEPDIR)/rename.Po $(DEPDIR)/rmdir.Po \
+@AMDEP_TRUE@	$(DEPDIR)/rpmatch.Po $(DEPDIR)/sig2str.Po \
+@AMDEP_TRUE@	$(DEPDIR)/stat.Po $(DEPDIR)/stpcpy.Po \
+@AMDEP_TRUE@	$(DEPDIR)/strcasecmp.Po $(DEPDIR)/strcspn.Po \
+@AMDEP_TRUE@	$(DEPDIR)/strdup.Po $(DEPDIR)/strncasecmp.Po \
+@AMDEP_TRUE@	$(DEPDIR)/strndup.Po $(DEPDIR)/strnlen.Po \
+@AMDEP_TRUE@	$(DEPDIR)/strpbrk.Po $(DEPDIR)/strstr.Po \
+@AMDEP_TRUE@	$(DEPDIR)/strtod.Po $(DEPDIR)/strtoimax.Po \
+@AMDEP_TRUE@	$(DEPDIR)/strtol.Po $(DEPDIR)/strtoll.Po \
+@AMDEP_TRUE@	$(DEPDIR)/strtoul.Po $(DEPDIR)/strtoull.Po \
+@AMDEP_TRUE@	$(DEPDIR)/strtoumax.Po $(DEPDIR)/strverscmp.Po \
+@AMDEP_TRUE@	$(DEPDIR)/tempname.Po $(DEPDIR)/utime.Po \
+@AMDEP_TRUE@	$(DEPDIR)/vasnprintf.Po $(DEPDIR)/vasprintf.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/acl.Po ./$(DEPDIR)/addext.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/allocsa.Po ./$(DEPDIR)/argmatch.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/backupfile.Po ./$(DEPDIR)/basename.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/c-strtod.Po ./$(DEPDIR)/canon-host.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/cloexec.Po ./$(DEPDIR)/closeout.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/cycle-check.Po ./$(DEPDIR)/diacrit.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/dirname.Po ./$(DEPDIR)/dup-safer.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/exclude.Po ./$(DEPDIR)/exitfail.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/file-type.Po ./$(DEPDIR)/filemode.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/fopen-safer.Po ./$(DEPDIR)/fts.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/full-read.Po ./$(DEPDIR)/full-write.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/getdate.Po ./$(DEPDIR)/getopt.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/getopt1.Po ./$(DEPDIR)/gettime.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/getugroups.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/hard-locale.Po ./$(DEPDIR)/hash-pjw.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/hash.Po ./$(DEPDIR)/human.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/idcache.Po ./$(DEPDIR)/imaxtostr.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/isdir.Po ./$(DEPDIR)/linebuffer.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/localcharset.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/long-options.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/makepath.Po ./$(DEPDIR)/mbswidth.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/md5.Po ./$(DEPDIR)/memcasecmp.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/memcoll.Po ./$(DEPDIR)/modechange.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/offtostr.Po ./$(DEPDIR)/path-concat.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/physmem.Po ./$(DEPDIR)/posixtm.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/posixver.Po ./$(DEPDIR)/quote.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/quotearg.Po ./$(DEPDIR)/readtokens.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/readtokens0.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/root-dev-ino.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/safe-read.Po ./$(DEPDIR)/safe-write.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/same.Po ./$(DEPDIR)/save-cwd.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/savedir.Po ./$(DEPDIR)/settime.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/sha1.Po ./$(DEPDIR)/strftime.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/stripslash.Po ./$(DEPDIR)/time_r.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/umaxtostr.Po ./$(DEPDIR)/unicodeio.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/userspec.Po ./$(DEPDIR)/utimecmp.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/utimens.Po ./$(DEPDIR)/version-etc.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/xfts.Po ./$(DEPDIR)/xgetcwd.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/xgethostname.Po ./$(DEPDIR)/xmalloc.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/xmemcoll.Po ./$(DEPDIR)/xnanosleep.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/xreadlink.Po ./$(DEPDIR)/xstrdup.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/xstrndup.Po ./$(DEPDIR)/xstrtod.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/xstrtoimax.Po ./$(DEPDIR)/xstrtol.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/xstrtoul.Po ./$(DEPDIR)/xstrtoumax.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/yesno.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -299,8 +384,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -331,53 +414,134 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 noinst_LIBRARIES = libfetish.a
 AM_CPPFLAGS = -I.. -I$(srcdir)
-libfetish_a_SOURCES = acl.h acl.c getdate.h getdate.y posixtm.c \
-	posixtm.h posixver.c posixver.h strftime.c strftime.h getopt.c \
-	getopt.h getopt1.c getopt_int.h hash.c hash.h hash-pjw.c \
-	hash-pjw.h __fpending.h addext.c allocsa.c allocsa.h \
-	argmatch.c argmatch.h backupfile.c backupfile.h basename.c \
-	c-strtod.c c-strtod.h canon-host.c canonicalize.h cloexec.c \
-	cloexec.h closeout.c closeout.h cycle-check.c cycle-check.h \
-	dev-ino.h diacrit.c diacrit.h dirname.c dirname.h dirfd.h \
-	dup-safer.c euidaccess.h exclude.c exclude.h exit.h exitfail.c \
-	exitfail.h filemode.c filemode.h file-type.c file-type.h \
-	fopen-safer.c fsusage.h fts.c fts_.h full-read.c full-read.h \
-	full-write.c full-write.h getline.h getpagesize.h gettime.c \
-	gettext.h getugroups.c group-member.h hard-locale.c \
-	hard-locale.h human.c human.h idcache.c isdir.c imaxtostr.c \
-	lchown.h linebuffer.c linebuffer.h localcharset.c \
-	localcharset.h long-options.c long-options.h makepath.c \
-	makepath.h mbswidth.c mbswidth.h md5.c md5.h memcasecmp.c \
-	memcasecmp.h memcoll.c memcoll.h modechange.c modechange.h \
-	mountlist.h offtostr.c path-concat.c path-concat.h pathmax.h \
-	physmem.c physmem.h quote.c quote.h quotearg.c quotearg.h \
-	readtokens0.c readtokens0.h readtokens.c readtokens.h \
-	readutmp.h regex.h root-dev-ino.c root-dev-ino.h safe-read.c \
-	safe-read.h safe-write.c safe-write.h same.c same.h save-cwd.c \
-	save-cwd.h savedir.c savedir.h settime.c sha1.c sha1.h \
-	sig2str.h stat-macros.h stdio-safer.h stripslash.c strdup.h \
-	strndup.h strverscmp.h time_r.c time_r.h timespec.h \
-	umaxtostr.c unicodeio.c unicodeio.h unistd-safer.h \
-	unlocked-io.h userspec.c userspec.h utimecmp.c utimecmp.h \
-	utimens.c utimens.h version-etc.c version-etc.h xalloc.h \
-	xfts.c xfts.h xgetcwd.c xgetcwd.h xgethostname.c \
-	xgethostname.h xmalloc.c xmemcoll.c xmemcoll.h xnanosleep.c \
-	xnanosleep.h xreadlink.c xreadlink.h xstrdup.c xstrndup.c \
-	xstrndup.h xstrtod.c xstrtod.h xstrtoimax.c xstrtol.c \
-	xstrtol.h xstrtoul.c xstrtoumax.c yesno.c printf-args.h \
-	printf-parse.h vasprintf.h vasnprintf.h
+libfetish_a_SOURCES = \
+  acl.h acl.c \
+  getdate.h getdate.y \
+  posixtm.c posixtm.h \
+  posixver.c posixver.h \
+  strftime.c strftime.h \
+  getopt.c getopt.h getopt1.c getopt_int.h \
+  hash.c hash.h \
+  hash-pjw.c hash-pjw.h \
+  __fpending.h \
+  addext.c \
+  allocsa.c allocsa.h \
+  argmatch.c argmatch.h \
+  backupfile.c backupfile.h \
+  basename.c \
+  c-strtod.c c-strtod.h \
+  canon-host.c \
+  canonicalize.h \
+  cloexec.c cloexec.h \
+  closeout.c closeout.h \
+  cycle-check.c cycle-check.h \
+  dev-ino.h \
+  diacrit.c diacrit.h \
+  dirname.c dirname.h \
+  dirfd.h \
+  dup-safer.c \
+  euidaccess.h \
+  exclude.c exclude.h \
+  exit.h \
+  exitfail.c exitfail.h \
+  filemode.c filemode.h \
+  file-type.c file-type.h \
+  fopen-safer.c \
+  fsusage.h \
+  fts.c fts_.h \
+  full-read.c full-read.h \
+  full-write.c full-write.h \
+  getline.h \
+  getpagesize.h \
+  gettime.c \
+  gettext.h \
+  getugroups.c \
+  group-member.h \
+  hard-locale.c hard-locale.h \
+  human.c human.h \
+  idcache.c \
+  isdir.c \
+  imaxtostr.c \
+  lchown.h \
+  linebuffer.c linebuffer.h \
+  localcharset.c localcharset.h \
+  long-options.c long-options.h \
+  makepath.c makepath.h \
+  mbswidth.c mbswidth.h \
+  md5.c md5.h \
+  memcasecmp.c memcasecmp.h \
+  memcoll.c memcoll.h \
+  modechange.c modechange.h \
+  mountlist.h \
+  offtostr.c \
+  path-concat.c path-concat.h \
+  pathmax.h \
+  physmem.c physmem.h \
+  quote.c quote.h \
+  quotearg.c quotearg.h \
+  readtokens0.c readtokens0.h \
+  readtokens.c readtokens.h \
+  readutmp.h \
+  regex.h \
+  root-dev-ino.c root-dev-ino.h \
+  safe-read.c safe-read.h \
+  safe-write.c safe-write.h \
+  same.c same.h \
+  save-cwd.c save-cwd.h \
+  savedir.c savedir.h \
+  settime.c \
+  sha1.c sha1.h \
+  sig2str.h \
+  stat-macros.h \
+  stdio-safer.h \
+  stripslash.c \
+  strdup.h \
+  strndup.h \
+  strverscmp.h \
+  time_r.c time_r.h \
+  timespec.h \
+  umaxtostr.c \
+  unicodeio.c unicodeio.h \
+  unistd-safer.h \
+  unlocked-io.h \
+  userspec.c userspec.h \
+  utimecmp.c utimecmp.h \
+  utimens.c utimens.h \
+  version-etc.c version-etc.h \
+  xalloc.h \
+  xfts.c xfts.h \
+  xgetcwd.c xgetcwd.h \
+  xgethostname.c xgethostname.h \
+  xmalloc.c \
+  xmemcoll.c xmemcoll.h \
+  xnanosleep.c xnanosleep.h \
+  xreadlink.c xreadlink.h \
+  xstrdup.c  \
+  xstrndup.c xstrndup.h \
+  xstrtod.c xstrtod.h \
+  xstrtoimax.c \
+  xstrtol.c xstrtol.h \
+  xstrtoul.c \
+  xstrtoumax.c \
+  yesno.c\
+\
+  printf-args.h \
+  printf-parse.h \
+  vasprintf.h \
+  vasnprintf.h
+
 libfetish_a_LIBADD = $(LIBOBJS) $(ALLOCA)
 libfetish_a_DEPENDENCIES = $(libfetish_a_LIBADD)
 lib_OBJECTS = $(libfetish_a_OBJECTS)
 BUILT_SOURCES = getdate.c $(STDBOOL_H) $(ALLOCA_H) $(FNMATCH_H)
 CLEANFILES = charset.alias ref-add.sed ref-del.sed
 MAINTAINERCLEANFILES = $(BUILT_SOURCES)
-MOSTLYCLEANFILES = stdbool.h stdbool.ht alloca.h alloca.h-t fnmatch.h \
-	fnmatch.h-t
+MOSTLYCLEANFILES = stdbool.h stdbool.ht alloca.h alloca.h-t fnmatch.h fnmatch.h-t
 SUFFIXES = .sed .sin
-EXTRA_DIST = config.charset ref-add.sin ref-del.sin getndelim2.c \
-	getndelim2.h inttostr.c inttostr.h stdbool_.h alloca_.h \
-	fnmatch_.h fnmatch_loop.c
+EXTRA_DIST = config.charset ref-add.sin ref-del.sin \
+  getndelim2.c getndelim2.h \
+  inttostr.c inttostr.h\
+stdbool_.h alloca_.h fnmatch_.h fnmatch_loop.c
 charset_alias = $(DESTDIR)$(libdir)/charset.alias
 charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
 all: $(BUILT_SOURCES)
@@ -595,14 +759,16 @@ distclean-compile:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .y.c:
diff --git a/man/Makefile.in b/man/Makefile.in
index acfeea5cd..fd8f5cc10 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -237,8 +237,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/src/Makefile.in b/src/Makefile.in
index 3087831dd..6f6d46fd1 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -609,6 +609,54 @@ SCRIPTS = $(bin_SCRIPTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/basename.Po ./$(DEPDIR)/cat.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/chgrp.Po ./$(DEPDIR)/chmod.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/chown-core.Po ./$(DEPDIR)/chown.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/chroot.Po ./$(DEPDIR)/cksum.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/comm.Po ./$(DEPDIR)/copy.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/cp-hash.Po ./$(DEPDIR)/cp.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/csplit.Po ./$(DEPDIR)/cut.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/date.Po ./$(DEPDIR)/dd.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/df.Po ./$(DEPDIR)/dircolors.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/dirname.Po ./$(DEPDIR)/du.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/echo.Po ./$(DEPDIR)/env.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/expand.Po ./$(DEPDIR)/expr.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/factor.Po ./$(DEPDIR)/false.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/fmt.Po ./$(DEPDIR)/fold.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/head.Po ./$(DEPDIR)/hostid.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/hostname.Po ./$(DEPDIR)/id.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/install.Po ./$(DEPDIR)/join.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/kill.Po ./$(DEPDIR)/lbracket.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/link.Po ./$(DEPDIR)/ln.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/logname.Po ./$(DEPDIR)/ls-dir.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/ls-ls.Po ./$(DEPDIR)/ls-vdir.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/ls.Po ./$(DEPDIR)/md5.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/md5sum.Po ./$(DEPDIR)/mkdir.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/mkfifo.Po ./$(DEPDIR)/mknod.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/mv.Po ./$(DEPDIR)/nice.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/nl.Po ./$(DEPDIR)/nohup.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/od.Po ./$(DEPDIR)/paste.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/pathchk.Po ./$(DEPDIR)/pinky.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/pr.Po ./$(DEPDIR)/printenv.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/printf.Po ./$(DEPDIR)/ptx.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/pwd.Po ./$(DEPDIR)/readlink.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/remove.Po ./$(DEPDIR)/rm.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/rmdir.Po ./$(DEPDIR)/seq.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/setuidgid.Po ./$(DEPDIR)/sha1sum.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/shred.Po ./$(DEPDIR)/sleep.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/sort.Po ./$(DEPDIR)/split.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/stat.Po ./$(DEPDIR)/stty.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/su.Po ./$(DEPDIR)/sum.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/sync.Po ./$(DEPDIR)/tac.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/tail.Po ./$(DEPDIR)/tee.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/test.Po ./$(DEPDIR)/touch.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/tr.Po ./$(DEPDIR)/true.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/tsort.Po ./$(DEPDIR)/tty.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/uname.Po ./$(DEPDIR)/unexpand.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/uniq.Po ./$(DEPDIR)/unlink.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/uptime.Po ./$(DEPDIR)/users.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/wc.Po ./$(DEPDIR)/who.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/whoami.Po ./$(DEPDIR)/yes.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -740,8 +788,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -848,8 +894,7 @@ md5sum_SOURCES = md5sum.c md5.c
 sha1sum_SOURCES = md5sum.c sha1sum.c
 editpl = sed -e 's,@''PERL''@,$(PERL),g'
 localedir = $(datadir)/locale
-BUILT_SOURCES = localedir.h dircolors.h wheel-size.h wheel.h false.c \
-	fs.h
+BUILT_SOURCES = localedir.h dircolors.h wheel-size.h wheel.h false.c fs.h
 DISTCLEANFILES = localedir.h
 wheel_size = 5
 
@@ -1363,14 +1408,16 @@ distclean-compile:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 uninstall-info-am:
 
diff --git a/tests/Makefile.in b/tests/Makefile.in
index ab81b4032..1feb704b5 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -241,8 +241,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -551,14 +549,12 @@ distdir: $(DISTFILES)
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || mkdir "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="../$(top_distdir)" \
+	        distdir="../$(distdir)/$$subdir" \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
diff --git a/tests/basename/Makefile.in b/tests/basename/Makefile.in
index 1a994939d..1c8ee3e21 100644
--- a/tests/basename/Makefile.in
+++ b/tests/basename/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -232,8 +232,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/tests/chgrp/Makefile.in b/tests/chgrp/Makefile.in
index 62cb85178..608e003ae 100644
--- a/tests/chgrp/Makefile.in
+++ b/tests/chgrp/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -232,8 +232,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/tests/chmod/Makefile.in b/tests/chmod/Makefile.in
index b88d900da..e8cc3b5de 100644
--- a/tests/chmod/Makefile.in
+++ b/tests/chmod/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -232,8 +232,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/tests/chown/Makefile.in b/tests/chown/Makefile.in
index 15752a5af..f2a93de5b 100644
--- a/tests/chown/Makefile.in
+++ b/tests/chown/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -232,8 +232,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/tests/cp/Makefile.in b/tests/cp/Makefile.in
index 8c4fee986..9358a774d 100644
--- a/tests/cp/Makefile.in
+++ b/tests/cp/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -232,8 +232,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/tests/cut/Makefile.in b/tests/cut/Makefile.in
index eeb4ba564..552ed2f81 100644
--- a/tests/cut/Makefile.in
+++ b/tests/cut/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -234,8 +234,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/tests/date/Makefile.in b/tests/date/Makefile.in
index 04b80eebd..192e22397 100644
--- a/tests/date/Makefile.in
+++ b/tests/date/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -234,8 +234,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/tests/dd/Makefile.in b/tests/dd/Makefile.in
index eca58ba9f..96fc94771 100644
--- a/tests/dd/Makefile.in
+++ b/tests/dd/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -232,8 +232,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/tests/dircolors/Makefile.in b/tests/dircolors/Makefile.in
index 780396995..7793fbcf0 100644
--- a/tests/dircolors/Makefile.in
+++ b/tests/dircolors/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -232,8 +232,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/tests/du/Makefile.in b/tests/du/Makefile.in
index a072df978..b7f2743fb 100644
--- a/tests/du/Makefile.in
+++ b/tests/du/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -232,8 +232,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/tests/expr/Makefile.in b/tests/expr/Makefile.in
index 9b560f8e9..41e94ab26 100644
--- a/tests/expr/Makefile.in
+++ b/tests/expr/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -232,8 +232,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/tests/factor/Makefile.in b/tests/factor/Makefile.in
index 3d68d213c..bca87f009 100644
--- a/tests/factor/Makefile.in
+++ b/tests/factor/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -232,8 +232,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/tests/fmt/Makefile.in b/tests/fmt/Makefile.in
index b8ba19639..13dda403f 100644
--- a/tests/fmt/Makefile.in
+++ b/tests/fmt/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -232,8 +232,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/tests/head/Makefile.in b/tests/head/Makefile.in
index 9812a3e38..61243fc07 100644
--- a/tests/head/Makefile.in
+++ b/tests/head/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -234,8 +234,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/tests/install/Makefile.in b/tests/install/Makefile.in
index a24ab6e20..0f590c223 100644
--- a/tests/install/Makefile.in
+++ b/tests/install/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -232,8 +232,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/tests/join/Makefile.in b/tests/join/Makefile.in
index a45cc8119..2a54a77c5 100644
--- a/tests/join/Makefile.in
+++ b/tests/join/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -234,8 +234,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/tests/ln/Makefile.in b/tests/ln/Makefile.in
index a9b471e23..dec3573bd 100644
--- a/tests/ln/Makefile.in
+++ b/tests/ln/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -232,8 +232,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/tests/ls-2/Makefile.in b/tests/ls-2/Makefile.in
index b6a9b1836..a623aac77 100644
--- a/tests/ls-2/Makefile.in
+++ b/tests/ls-2/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -232,8 +232,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/tests/ls/Makefile.in b/tests/ls/Makefile.in
index 1ca5556f4..133c3d4cb 100644
--- a/tests/ls/Makefile.in
+++ b/tests/ls/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -232,8 +232,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/tests/md5sum/Makefile.in b/tests/md5sum/Makefile.in
index e78d5ba11..917797ef2 100644
--- a/tests/md5sum/Makefile.in
+++ b/tests/md5sum/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -232,8 +232,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/tests/misc/Makefile.in b/tests/misc/Makefile.in
index 76979a3d1..ecca1b1c9 100644
--- a/tests/misc/Makefile.in
+++ b/tests/misc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -232,8 +232,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/tests/mkdir/Makefile.in b/tests/mkdir/Makefile.in
index 2473f45b4..f2fc60b4a 100644
--- a/tests/mkdir/Makefile.in
+++ b/tests/mkdir/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -232,8 +232,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/tests/mv/Makefile.in b/tests/mv/Makefile.in
index b58533847..c2c8105bf 100644
--- a/tests/mv/Makefile.in
+++ b/tests/mv/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -232,8 +232,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/tests/od/Makefile.in b/tests/od/Makefile.in
index 12d738de0..7f3cd3193 100644
--- a/tests/od/Makefile.in
+++ b/tests/od/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -232,8 +232,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/tests/pr/Makefile.in b/tests/pr/Makefile.in
index 2e13d3910..289259e25 100644
--- a/tests/pr/Makefile.in
+++ b/tests/pr/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -234,8 +234,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/tests/rm/Makefile.in b/tests/rm/Makefile.in
index efe06187e..dc4074c20 100644
--- a/tests/rm/Makefile.in
+++ b/tests/rm/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -232,8 +232,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/tests/rmdir/Makefile.in b/tests/rmdir/Makefile.in
index ebaa6e710..a7719f819 100644
--- a/tests/rmdir/Makefile.in
+++ b/tests/rmdir/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -232,8 +232,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/tests/seq/Makefile.in b/tests/seq/Makefile.in
index 2de6788a3..2b52c2472 100644
--- a/tests/seq/Makefile.in
+++ b/tests/seq/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -232,8 +232,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/tests/sha1sum/Makefile.in b/tests/sha1sum/Makefile.in
index 8dc8a1ae9..335d30ac7 100644
--- a/tests/sha1sum/Makefile.in
+++ b/tests/sha1sum/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -232,8 +232,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/tests/shred/Makefile.in b/tests/shred/Makefile.in
index 67bfa597f..c28037d97 100644
--- a/tests/shred/Makefile.in
+++ b/tests/shred/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -232,8 +232,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/tests/sort/Makefile.in b/tests/sort/Makefile.in
index 446ffa6a1..b3ecaeb77 100644
--- a/tests/sort/Makefile.in
+++ b/tests/sort/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -234,8 +234,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/tests/stty/Makefile.in b/tests/stty/Makefile.in
index d904fbf8c..e5cbe8740 100644
--- a/tests/stty/Makefile.in
+++ b/tests/stty/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -232,8 +232,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/tests/sum/Makefile.in b/tests/sum/Makefile.in
index efc7bbe94..a37c89dab 100644
--- a/tests/sum/Makefile.in
+++ b/tests/sum/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -232,8 +232,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/tests/tac/Makefile.in b/tests/tac/Makefile.in
index 7bc53b26e..44451a714 100644
--- a/tests/tac/Makefile.in
+++ b/tests/tac/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -234,8 +234,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/tests/tail-2/Makefile.in b/tests/tail-2/Makefile.in
index e83823475..f0b726448 100644
--- a/tests/tail-2/Makefile.in
+++ b/tests/tail-2/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -232,8 +232,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/tests/tail/Makefile.in b/tests/tail/Makefile.in
index 8cb6dae41..ca1a1aeef 100644
--- a/tests/tail/Makefile.in
+++ b/tests/tail/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -234,8 +234,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/tests/test/Makefile.in b/tests/test/Makefile.in
index fb8c427f6..18af7025b 100644
--- a/tests/test/Makefile.in
+++ b/tests/test/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -234,8 +234,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/tests/touch/Makefile.in b/tests/touch/Makefile.in
index b49de4f00..67a158750 100644
--- a/tests/touch/Makefile.in
+++ b/tests/touch/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -232,8 +232,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/tests/tr/Makefile.in b/tests/tr/Makefile.in
index 0ec718080..0dd03a927 100644
--- a/tests/tr/Makefile.in
+++ b/tests/tr/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -234,8 +234,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/tests/tsort/Makefile.in b/tests/tsort/Makefile.in
index 20bd63d56..de5521228 100644
--- a/tests/tsort/Makefile.in
+++ b/tests/tsort/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -232,8 +232,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/tests/unexpand/Makefile.in b/tests/unexpand/Makefile.in
index b7a2527f9..596fce68f 100644
--- a/tests/unexpand/Makefile.in
+++ b/tests/unexpand/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -232,8 +232,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/tests/uniq/Makefile.in b/tests/uniq/Makefile.in
index 5137b5eeb..9c2a4403f 100644
--- a/tests/uniq/Makefile.in
+++ b/tests/uniq/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -234,8 +234,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
diff --git a/tests/wc/Makefile.in b/tests/wc/Makefile.in
index 46839b9cb..453f1b985 100644
--- a/tests/wc/Makefile.in
+++ b/tests/wc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8b from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -234,8 +234,6 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@