.

8 files changed, 192 insertions, 192 deletions

diff --git a/tests/cut/Makefile.in b/tests/cut/Makefile.in
index 2c1bcf463..bf70b2d45 100644
--- a/tests/cut/Makefile.in
+++ b/tests/cut/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.1p from Makefile.am
+# Makefile.in generated automatically by automake 1.2 from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 
@@ -49,10 +49,6 @@ POST_INSTALL = true
 NORMAL_UNINSTALL = true
 PRE_UNINSTALL = true
 POST_UNINSTALL = true
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -156,24 +152,27 @@ check-TESTS: $(TESTS)
 	@failed=0; all=0; \
 	srcdir=$(srcdir); export srcdir; \
 	for tst in $(TESTS); do \
-	  all=`expr $$all + 1`; \
 	  if test -f $$tst; then dir=.; \
 	  else dir="$(srcdir)"; fi; \
 	  if $(TESTS_ENVIRONMENT) $$dir/$$tst; then \
+	    all=`expr $$all + 1`; \
 	    echo "PASS: $$tst"; \
-	  else \
+	  elif test $$? -ne 77; then \
+	    all=`expr $$all + 1`; \
 	    failed=`expr $$failed + 1`; \
 	    echo "FAIL: $$tst"; \
 	  fi; \
 	done; \
 	if test "$$failed" -eq 0; then \
-	  echo "========================"; \
-	  echo "All $$all tests passed"; \
-	  echo "========================"; \
+	  banner="All $$all tests passed"; \
 	else \
-	  echo "$$failed of $$all tests failed"; \
-	  exit 1; \
-	fi
+	  banner="$$failed of $$all tests failed"; \
+	fi; \
+	dashes=`echo "$$banner" | sed s/./=/g`; \
+	echo "$$dashes"; \
+	echo "$$banner"; \
+	echo "$$dashes"; \
+	test "$$failed" -eq 0
 info:
 dvi:
 check: all
@@ -193,7 +192,7 @@ uninstall:
 all: Makefile $(SCRIPTS)
 
 install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
+	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
 installdirs:
 
 
@@ -228,26 +227,27 @@ mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-$x-tests: @MAINT@mk-script Test.pm
+$(srcdir)/$x-tests: @MAINT@mk-script Test.pm
 	./mk-script ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
+mk-script: ../../config.status
+
 .pl:
 	rm -f $@ $@.tmp
 	$(editpl) $< > $@.tmp
 	chmod +x-w $@.tmp
 	mv $@.tmp $@
 
-@MAINT@rebuild-check: Test.pm mk-script
-@MAINT@	rb=rb-check; rm -f $rb; \
-@MAINT@	m_template=../Makefile.am.in; \
-@MAINT@	sed -n '1,/^##test-files-begin/p' $$m_template > $$rb; \
+@MAINT@Makefile.am: ../Makefile.am.in Test.pm mk-script
+@MAINT@	rm -f $@ $@t
+@MAINT@	sed -n '1,/^##test-files-begin/p' $< > $@t
 @MAINT@	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
-@MAINT@	echo "x = $$tool" >> $$rb; \
-@MAINT@	./mk-script --list >> $$rb; \
-@MAINT@	sed -n '/^##test-files-end/,$$p' $$m_template >> $$rb; \
-@MAINT@	diff -u Makefile.am $$rb && echo ok || echo no
+@MAINT@	  echo "x = $$tool" >> $@t
+@MAINT@	./mk-script --list >> $@t
+@MAINT@	sed -n '/^##test-files-end/,$$p' $< >> $@t
+@MAINT@	mv $@t $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/tests/join/Makefile.in b/tests/join/Makefile.in
index 0703eda9a..023a1d9d8 100644
--- a/tests/join/Makefile.in
+++ b/tests/join/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.1p from Makefile.am
+# Makefile.in generated automatically by automake 1.2 from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 
@@ -49,10 +49,6 @@ POST_INSTALL = true
 NORMAL_UNINSTALL = true
 PRE_UNINSTALL = true
 POST_UNINSTALL = true
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -158,24 +154,27 @@ check-TESTS: $(TESTS)
 	@failed=0; all=0; \
 	srcdir=$(srcdir); export srcdir; \
 	for tst in $(TESTS); do \
-	  all=`expr $$all + 1`; \
 	  if test -f $$tst; then dir=.; \
 	  else dir="$(srcdir)"; fi; \
 	  if $(TESTS_ENVIRONMENT) $$dir/$$tst; then \
+	    all=`expr $$all + 1`; \
 	    echo "PASS: $$tst"; \
-	  else \
+	  elif test $$? -ne 77; then \
+	    all=`expr $$all + 1`; \
 	    failed=`expr $$failed + 1`; \
 	    echo "FAIL: $$tst"; \
 	  fi; \
 	done; \
 	if test "$$failed" -eq 0; then \
-	  echo "========================"; \
-	  echo "All $$all tests passed"; \
-	  echo "========================"; \
+	  banner="All $$all tests passed"; \
 	else \
-	  echo "$$failed of $$all tests failed"; \
-	  exit 1; \
-	fi
+	  banner="$$failed of $$all tests failed"; \
+	fi; \
+	dashes=`echo "$$banner" | sed s/./=/g`; \
+	echo "$$dashes"; \
+	echo "$$banner"; \
+	echo "$$dashes"; \
+	test "$$failed" -eq 0
 info:
 dvi:
 check: all
@@ -195,7 +194,7 @@ uninstall:
 all: Makefile $(SCRIPTS)
 
 install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
+	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
 installdirs:
 
 
@@ -230,26 +229,27 @@ mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-$x-tests: @MAINT@mk-script Test.pm
+$(srcdir)/$x-tests: @MAINT@mk-script Test.pm
 	./mk-script ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
+mk-script: ../../config.status
+
 .pl:
 	rm -f $@ $@.tmp
 	$(editpl) $< > $@.tmp
 	chmod +x-w $@.tmp
 	mv $@.tmp $@
 
-@MAINT@rebuild-check: Test.pm mk-script
-@MAINT@	rb=rb-check; rm -f $rb; \
-@MAINT@	m_template=../Makefile.am.in; \
-@MAINT@	sed -n '1,/^##test-files-begin/p' $$m_template > $$rb; \
+@MAINT@Makefile.am: ../Makefile.am.in Test.pm mk-script
+@MAINT@	rm -f $@ $@t
+@MAINT@	sed -n '1,/^##test-files-begin/p' $< > $@t
 @MAINT@	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
-@MAINT@	echo "x = $$tool" >> $$rb; \
-@MAINT@	./mk-script --list >> $$rb; \
-@MAINT@	sed -n '/^##test-files-end/,$$p' $$m_template >> $$rb; \
-@MAINT@	diff -u Makefile.am $$rb && echo ok || echo no
+@MAINT@	  echo "x = $$tool" >> $@t
+@MAINT@	./mk-script --list >> $@t
+@MAINT@	sed -n '/^##test-files-end/,$$p' $< >> $@t
+@MAINT@	mv $@t $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/tests/md5sum/Makefile.in b/tests/md5sum/Makefile.in
index ac5fa9772..bc7849eb6 100644
--- a/tests/md5sum/Makefile.in
+++ b/tests/md5sum/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.1p from Makefile.am
+# Makefile.in generated automatically by automake 1.2 from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 
@@ -49,10 +49,6 @@ POST_INSTALL = true
 NORMAL_UNINSTALL = true
 PRE_UNINSTALL = true
 POST_UNINSTALL = true
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -146,24 +142,27 @@ check-TESTS: $(TESTS)
 	@failed=0; all=0; \
 	srcdir=$(srcdir); export srcdir; \
 	for tst in $(TESTS); do \
-	  all=`expr $$all + 1`; \
 	  if test -f $$tst; then dir=.; \
 	  else dir="$(srcdir)"; fi; \
 	  if $(TESTS_ENVIRONMENT) $$dir/$$tst; then \
+	    all=`expr $$all + 1`; \
 	    echo "PASS: $$tst"; \
-	  else \
+	  elif test $$? -ne 77; then \
+	    all=`expr $$all + 1`; \
 	    failed=`expr $$failed + 1`; \
 	    echo "FAIL: $$tst"; \
 	  fi; \
 	done; \
 	if test "$$failed" -eq 0; then \
-	  echo "========================"; \
-	  echo "All $$all tests passed"; \
-	  echo "========================"; \
+	  banner="All $$all tests passed"; \
 	else \
-	  echo "$$failed of $$all tests failed"; \
-	  exit 1; \
-	fi
+	  banner="$$failed of $$all tests failed"; \
+	fi; \
+	dashes=`echo "$$banner" | sed s/./=/g`; \
+	echo "$$dashes"; \
+	echo "$$banner"; \
+	echo "$$dashes"; \
+	test "$$failed" -eq 0
 info:
 dvi:
 check: all
@@ -183,7 +182,7 @@ uninstall:
 all: Makefile $(SCRIPTS)
 
 install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
+	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
 installdirs:
 
 
@@ -218,26 +217,27 @@ mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-$x-tests: @MAINT@mk-script Test.pm
+$(srcdir)/$x-tests: @MAINT@mk-script Test.pm
 	./mk-script ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
+mk-script: ../../config.status
+
 .pl:
 	rm -f $@ $@.tmp
 	$(editpl) $< > $@.tmp
 	chmod +x-w $@.tmp
 	mv $@.tmp $@
 
-@MAINT@rebuild-check: Test.pm mk-script
-@MAINT@	rb=rb-check; rm -f $rb; \
-@MAINT@	m_template=../Makefile.am.in; \
-@MAINT@	sed -n '1,/^##test-files-begin/p' $$m_template > $$rb; \
+@MAINT@Makefile.am: ../Makefile.am.in Test.pm mk-script
+@MAINT@	rm -f $@ $@t
+@MAINT@	sed -n '1,/^##test-files-begin/p' $< > $@t
 @MAINT@	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
-@MAINT@	echo "x = $$tool" >> $$rb; \
-@MAINT@	./mk-script --list >> $$rb; \
-@MAINT@	sed -n '/^##test-files-end/,$$p' $$m_template >> $$rb; \
-@MAINT@	diff -u Makefile.am $$rb && echo ok || echo no
+@MAINT@	  echo "x = $$tool" >> $@t
+@MAINT@	./mk-script --list >> $@t
+@MAINT@	sed -n '/^##test-files-end/,$$p' $< >> $@t
+@MAINT@	mv $@t $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/tests/pr/Makefile.in b/tests/pr/Makefile.in
index beb1702d9..00c7af136 100644
--- a/tests/pr/Makefile.in
+++ b/tests/pr/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.1p from Makefile.am
+# Makefile.in generated automatically by automake 1.2 from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 
@@ -49,10 +49,6 @@ POST_INSTALL = true
 NORMAL_UNINSTALL = true
 PRE_UNINSTALL = true
 POST_UNINSTALL = true
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -198,24 +194,27 @@ check-TESTS: $(TESTS)
 	@failed=0; all=0; \
 	srcdir=$(srcdir); export srcdir; \
 	for tst in $(TESTS); do \
-	  all=`expr $$all + 1`; \
 	  if test -f $$tst; then dir=.; \
 	  else dir="$(srcdir)"; fi; \
 	  if $(TESTS_ENVIRONMENT) $$dir/$$tst; then \
+	    all=`expr $$all + 1`; \
 	    echo "PASS: $$tst"; \
-	  else \
+	  elif test $$? -ne 77; then \
+	    all=`expr $$all + 1`; \
 	    failed=`expr $$failed + 1`; \
 	    echo "FAIL: $$tst"; \
 	  fi; \
 	done; \
 	if test "$$failed" -eq 0; then \
-	  echo "========================"; \
-	  echo "All $$all tests passed"; \
-	  echo "========================"; \
+	  banner="All $$all tests passed"; \
 	else \
-	  echo "$$failed of $$all tests failed"; \
-	  exit 1; \
-	fi
+	  banner="$$failed of $$all tests failed"; \
+	fi; \
+	dashes=`echo "$$banner" | sed s/./=/g`; \
+	echo "$$dashes"; \
+	echo "$$banner"; \
+	echo "$$dashes"; \
+	test "$$failed" -eq 0
 info:
 dvi:
 check: all
@@ -235,7 +234,7 @@ uninstall:
 all: Makefile $(SCRIPTS)
 
 install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
+	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
 installdirs:
 
 
@@ -270,26 +269,27 @@ mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-$x-tests: @MAINT@mk-script Test.pm
+$(srcdir)/$x-tests: @MAINT@mk-script Test.pm
 	./mk-script ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
+mk-script: ../../config.status
+
 .pl:
 	rm -f $@ $@.tmp
 	$(editpl) $< > $@.tmp
 	chmod +x-w $@.tmp
 	mv $@.tmp $@
 
-@MAINT@rebuild-check: Test.pm mk-script
-@MAINT@	rb=rb-check; rm -f $rb; \
-@MAINT@	m_template=../Makefile.am.in; \
-@MAINT@	sed -n '1,/^##test-files-begin/p' $$m_template > $$rb; \
+@MAINT@Makefile.am: ../Makefile.am.in Test.pm mk-script
+@MAINT@	rm -f $@ $@t
+@MAINT@	sed -n '1,/^##test-files-begin/p' $< > $@t
 @MAINT@	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
-@MAINT@	echo "x = $$tool" >> $$rb; \
-@MAINT@	./mk-script --list >> $$rb; \
-@MAINT@	sed -n '/^##test-files-end/,$$p' $$m_template >> $$rb; \
-@MAINT@	diff -u Makefile.am $$rb && echo ok || echo no
+@MAINT@	  echo "x = $$tool" >> $@t
+@MAINT@	./mk-script --list >> $@t
+@MAINT@	sed -n '/^##test-files-end/,$$p' $< >> $@t
+@MAINT@	mv $@t $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/tests/sort/Makefile.in b/tests/sort/Makefile.in
index 6b07ae96f..0599bc32e 100644
--- a/tests/sort/Makefile.in
+++ b/tests/sort/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.1p from Makefile.am
+# Makefile.in generated automatically by automake 1.2 from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 
@@ -49,10 +49,6 @@ POST_INSTALL = true
 NORMAL_UNINSTALL = true
 PRE_UNINSTALL = true
 POST_UNINSTALL = true
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -170,24 +166,27 @@ check-TESTS: $(TESTS)
 	@failed=0; all=0; \
 	srcdir=$(srcdir); export srcdir; \
 	for tst in $(TESTS); do \
-	  all=`expr $$all + 1`; \
 	  if test -f $$tst; then dir=.; \
 	  else dir="$(srcdir)"; fi; \
 	  if $(TESTS_ENVIRONMENT) $$dir/$$tst; then \
+	    all=`expr $$all + 1`; \
 	    echo "PASS: $$tst"; \
-	  else \
+	  elif test $$? -ne 77; then \
+	    all=`expr $$all + 1`; \
 	    failed=`expr $$failed + 1`; \
 	    echo "FAIL: $$tst"; \
 	  fi; \
 	done; \
 	if test "$$failed" -eq 0; then \
-	  echo "========================"; \
-	  echo "All $$all tests passed"; \
-	  echo "========================"; \
+	  banner="All $$all tests passed"; \
 	else \
-	  echo "$$failed of $$all tests failed"; \
-	  exit 1; \
-	fi
+	  banner="$$failed of $$all tests failed"; \
+	fi; \
+	dashes=`echo "$$banner" | sed s/./=/g`; \
+	echo "$$dashes"; \
+	echo "$$banner"; \
+	echo "$$dashes"; \
+	test "$$failed" -eq 0
 info:
 dvi:
 check: all
@@ -207,7 +206,7 @@ uninstall:
 all: Makefile $(SCRIPTS)
 
 install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
+	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
 installdirs:
 
 
@@ -242,26 +241,27 @@ mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-$x-tests: @MAINT@mk-script Test.pm
+$(srcdir)/$x-tests: @MAINT@mk-script Test.pm
 	./mk-script ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
+mk-script: ../../config.status
+
 .pl:
 	rm -f $@ $@.tmp
 	$(editpl) $< > $@.tmp
 	chmod +x-w $@.tmp
 	mv $@.tmp $@
 
-@MAINT@rebuild-check: Test.pm mk-script
-@MAINT@	rb=rb-check; rm -f $rb; \
-@MAINT@	m_template=../Makefile.am.in; \
-@MAINT@	sed -n '1,/^##test-files-begin/p' $$m_template > $$rb; \
+@MAINT@Makefile.am: ../Makefile.am.in Test.pm mk-script
+@MAINT@	rm -f $@ $@t
+@MAINT@	sed -n '1,/^##test-files-begin/p' $< > $@t
 @MAINT@	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
-@MAINT@	echo "x = $$tool" >> $$rb; \
-@MAINT@	./mk-script --list >> $$rb; \
-@MAINT@	sed -n '/^##test-files-end/,$$p' $$m_template >> $$rb; \
-@MAINT@	diff -u Makefile.am $$rb && echo ok || echo no
+@MAINT@	  echo "x = $$tool" >> $@t
+@MAINT@	./mk-script --list >> $@t
+@MAINT@	sed -n '/^##test-files-end/,$$p' $< >> $@t
+@MAINT@	mv $@t $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/tests/tac/Makefile.in b/tests/tac/Makefile.in
index 43958195a..8ba9b7439 100644
--- a/tests/tac/Makefile.in
+++ b/tests/tac/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.1p from Makefile.am
+# Makefile.in generated automatically by automake 1.2 from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 
@@ -49,10 +49,6 @@ POST_INSTALL = true
 NORMAL_UNINSTALL = true
 PRE_UNINSTALL = true
 POST_UNINSTALL = true
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -154,24 +150,27 @@ check-TESTS: $(TESTS)
 	@failed=0; all=0; \
 	srcdir=$(srcdir); export srcdir; \
 	for tst in $(TESTS); do \
-	  all=`expr $$all + 1`; \
 	  if test -f $$tst; then dir=.; \
 	  else dir="$(srcdir)"; fi; \
 	  if $(TESTS_ENVIRONMENT) $$dir/$$tst; then \
+	    all=`expr $$all + 1`; \
 	    echo "PASS: $$tst"; \
-	  else \
+	  elif test $$? -ne 77; then \
+	    all=`expr $$all + 1`; \
 	    failed=`expr $$failed + 1`; \
 	    echo "FAIL: $$tst"; \
 	  fi; \
 	done; \
 	if test "$$failed" -eq 0; then \
-	  echo "========================"; \
-	  echo "All $$all tests passed"; \
-	  echo "========================"; \
+	  banner="All $$all tests passed"; \
 	else \
-	  echo "$$failed of $$all tests failed"; \
-	  exit 1; \
-	fi
+	  banner="$$failed of $$all tests failed"; \
+	fi; \
+	dashes=`echo "$$banner" | sed s/./=/g`; \
+	echo "$$dashes"; \
+	echo "$$banner"; \
+	echo "$$dashes"; \
+	test "$$failed" -eq 0
 info:
 dvi:
 check: all
@@ -191,7 +190,7 @@ uninstall:
 all: Makefile $(SCRIPTS)
 
 install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
+	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
 installdirs:
 
 
@@ -226,26 +225,27 @@ mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-$x-tests: @MAINT@mk-script Test.pm
+$(srcdir)/$x-tests: @MAINT@mk-script Test.pm
 	./mk-script ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
+mk-script: ../../config.status
+
 .pl:
 	rm -f $@ $@.tmp
 	$(editpl) $< > $@.tmp
 	chmod +x-w $@.tmp
 	mv $@.tmp $@
 
-@MAINT@rebuild-check: Test.pm mk-script
-@MAINT@	rb=rb-check; rm -f $rb; \
-@MAINT@	m_template=../Makefile.am.in; \
-@MAINT@	sed -n '1,/^##test-files-begin/p' $$m_template > $$rb; \
+@MAINT@Makefile.am: ../Makefile.am.in Test.pm mk-script
+@MAINT@	rm -f $@ $@t
+@MAINT@	sed -n '1,/^##test-files-begin/p' $< > $@t
 @MAINT@	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
-@MAINT@	echo "x = $$tool" >> $$rb; \
-@MAINT@	./mk-script --list >> $$rb; \
-@MAINT@	sed -n '/^##test-files-end/,$$p' $$m_template >> $$rb; \
-@MAINT@	diff -u Makefile.am $$rb && echo ok || echo no
+@MAINT@	  echo "x = $$tool" >> $@t
+@MAINT@	./mk-script --list >> $@t
+@MAINT@	sed -n '/^##test-files-end/,$$p' $< >> $@t
+@MAINT@	mv $@t $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/tests/tail/Makefile.in b/tests/tail/Makefile.in
index 5f8d6eb7a..dd45dd398 100644
--- a/tests/tail/Makefile.in
+++ b/tests/tail/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.1p from Makefile.am
+# Makefile.in generated automatically by automake 1.2 from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 
@@ -49,10 +49,6 @@ POST_INSTALL = true
 NORMAL_UNINSTALL = true
 PRE_UNINSTALL = true
 POST_UNINSTALL = true
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -160,24 +156,27 @@ check-TESTS: $(TESTS)
 	@failed=0; all=0; \
 	srcdir=$(srcdir); export srcdir; \
 	for tst in $(TESTS); do \
-	  all=`expr $$all + 1`; \
 	  if test -f $$tst; then dir=.; \
 	  else dir="$(srcdir)"; fi; \
 	  if $(TESTS_ENVIRONMENT) $$dir/$$tst; then \
+	    all=`expr $$all + 1`; \
 	    echo "PASS: $$tst"; \
-	  else \
+	  elif test $$? -ne 77; then \
+	    all=`expr $$all + 1`; \
 	    failed=`expr $$failed + 1`; \
 	    echo "FAIL: $$tst"; \
 	  fi; \
 	done; \
 	if test "$$failed" -eq 0; then \
-	  echo "========================"; \
-	  echo "All $$all tests passed"; \
-	  echo "========================"; \
+	  banner="All $$all tests passed"; \
 	else \
-	  echo "$$failed of $$all tests failed"; \
-	  exit 1; \
-	fi
+	  banner="$$failed of $$all tests failed"; \
+	fi; \
+	dashes=`echo "$$banner" | sed s/./=/g`; \
+	echo "$$dashes"; \
+	echo "$$banner"; \
+	echo "$$dashes"; \
+	test "$$failed" -eq 0
 info:
 dvi:
 check: all
@@ -197,7 +196,7 @@ uninstall:
 all: Makefile $(SCRIPTS)
 
 install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
+	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
 installdirs:
 
 
@@ -232,26 +231,27 @@ mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-$x-tests: @MAINT@mk-script Test.pm
+$(srcdir)/$x-tests: @MAINT@mk-script Test.pm
 	./mk-script ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
+mk-script: ../../config.status
+
 .pl:
 	rm -f $@ $@.tmp
 	$(editpl) $< > $@.tmp
 	chmod +x-w $@.tmp
 	mv $@.tmp $@
 
-@MAINT@rebuild-check: Test.pm mk-script
-@MAINT@	rb=rb-check; rm -f $rb; \
-@MAINT@	m_template=../Makefile.am.in; \
-@MAINT@	sed -n '1,/^##test-files-begin/p' $$m_template > $$rb; \
+@MAINT@Makefile.am: ../Makefile.am.in Test.pm mk-script
+@MAINT@	rm -f $@ $@t
+@MAINT@	sed -n '1,/^##test-files-begin/p' $< > $@t
 @MAINT@	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
-@MAINT@	echo "x = $$tool" >> $$rb; \
-@MAINT@	./mk-script --list >> $$rb; \
-@MAINT@	sed -n '/^##test-files-end/,$$p' $$m_template >> $$rb; \
-@MAINT@	diff -u Makefile.am $$rb && echo ok || echo no
+@MAINT@	  echo "x = $$tool" >> $@t
+@MAINT@	./mk-script --list >> $@t
+@MAINT@	sed -n '/^##test-files-end/,$$p' $< >> $@t
+@MAINT@	mv $@t $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/tests/tr/Makefile.in b/tests/tr/Makefile.in
index b666b6552..896a16de6 100644
--- a/tests/tr/Makefile.in
+++ b/tests/tr/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.1p from Makefile.am
+# Makefile.in generated automatically by automake 1.2 from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 
@@ -49,10 +49,6 @@ POST_INSTALL = true
 NORMAL_UNINSTALL = true
 PRE_UNINSTALL = true
 POST_UNINSTALL = true
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -162,24 +158,27 @@ check-TESTS: $(TESTS)
 	@failed=0; all=0; \
 	srcdir=$(srcdir); export srcdir; \
 	for tst in $(TESTS); do \
-	  all=`expr $$all + 1`; \
 	  if test -f $$tst; then dir=.; \
 	  else dir="$(srcdir)"; fi; \
 	  if $(TESTS_ENVIRONMENT) $$dir/$$tst; then \
+	    all=`expr $$all + 1`; \
 	    echo "PASS: $$tst"; \
-	  else \
+	  elif test $$? -ne 77; then \
+	    all=`expr $$all + 1`; \
 	    failed=`expr $$failed + 1`; \
 	    echo "FAIL: $$tst"; \
 	  fi; \
 	done; \
 	if test "$$failed" -eq 0; then \
-	  echo "========================"; \
-	  echo "All $$all tests passed"; \
-	  echo "========================"; \
+	  banner="All $$all tests passed"; \
 	else \
-	  echo "$$failed of $$all tests failed"; \
-	  exit 1; \
-	fi
+	  banner="$$failed of $$all tests failed"; \
+	fi; \
+	dashes=`echo "$$banner" | sed s/./=/g`; \
+	echo "$$dashes"; \
+	echo "$$banner"; \
+	echo "$$dashes"; \
+	test "$$failed" -eq 0
 info:
 dvi:
 check: all
@@ -199,7 +198,7 @@ uninstall:
 all: Makefile $(SCRIPTS)
 
 install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
+	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
 installdirs:
 
 
@@ -234,26 +233,27 @@ mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-$x-tests: @MAINT@mk-script Test.pm
+$(srcdir)/$x-tests: @MAINT@mk-script Test.pm
 	./mk-script ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
+mk-script: ../../config.status
+
 .pl:
 	rm -f $@ $@.tmp
 	$(editpl) $< > $@.tmp
 	chmod +x-w $@.tmp
 	mv $@.tmp $@
 
-@MAINT@rebuild-check: Test.pm mk-script
-@MAINT@	rb=rb-check; rm -f $rb; \
-@MAINT@	m_template=../Makefile.am.in; \
-@MAINT@	sed -n '1,/^##test-files-begin/p' $$m_template > $$rb; \
+@MAINT@Makefile.am: ../Makefile.am.in Test.pm mk-script
+@MAINT@	rm -f $@ $@t
+@MAINT@	sed -n '1,/^##test-files-begin/p' $< > $@t
 @MAINT@	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
-@MAINT@	echo "x = $$tool" >> $$rb; \
-@MAINT@	./mk-script --list >> $$rb; \
-@MAINT@	sed -n '/^##test-files-end/,$$p' $$m_template >> $$rb; \
-@MAINT@	diff -u Makefile.am $$rb && echo ok || echo no
+@MAINT@	  echo "x = $$tool" >> $@t
+@MAINT@	./mk-script --list >> $@t
+@MAINT@	sed -n '/^##test-files-end/,$$p' $< >> $@t
+@MAINT@	mv $@t $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.