5 files changed, 14 insertions, 22 deletions
diff --git a/tests/cut/Makefile.am b/tests/cut/Makefile.am
index 0be09be84..6141962eb 100644
--- a/tests/cut/Makefile.am
+++ b/tests/cut/Makefile.am
@@ -1,7 +1,5 @@
 ## Process this file with automake to produce Makefile.in.
 
-AUTOMAKE_OPTIONS = 1.1c
-
 x = cut
 t = t1 t2 t3 t4 t5 t6 t7 t8 t9 tA tB tC tD ta tb tc td te tf tg th \
 ti tj tk tl tm tn to tp tq tr ts tt tu tv tw tx ty tz
@@ -11,16 +9,16 @@ exp = $(t:=.exp)
 out = $(t:=.out)
 err = $(t:=.err)
 
-EXTRA_DIST = build-script.pl Test.pm $x-tests $(in) $(exp)
-noinst_SCRIPTS = $x-tests build-script
+EXTRA_DIST = mk-script.pl Test.pm $x-tests $(in) $(exp)
+noinst_SCRIPTS = $x-tests
 
 PERL = @PERL@
 editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,@srcdir@,g'
 
 TESTS = $x-tests
 
-$x-tests: @MAINT@build-script Test.pm
-	./build-script ../../src/$x > $@.n
+$x-tests: @MAINT@mk-script Test.pm
+	./mk-script ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
diff --git a/tests/join/Makefile.am b/tests/join/Makefile.am
index 5a7b8068a..dfed245c5 100644
--- a/tests/join/Makefile.am
+++ b/tests/join/Makefile.am
@@ -10,16 +10,16 @@ exp = $(t:=.exp)
 out = $(t:=.out)
 err = $(t:=.err)
 
-EXTRA_DIST = build-script.pl Test.pm $x-tests $(in1) $(in2) $(exp)
-noinst_SCRIPTS = $x-tests build-script
+EXTRA_DIST = mk-script.pl Test.pm $x-tests $(in1) $(in2) $(exp)
+noinst_SCRIPTS = $x-tests
 
 PERL = @PERL@
 editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,@srcdir@,g'
 
 TESTS = $x-tests
 
-$x-tests: @MAINT@build-script Test.pm
-	./build-script ../../src/$x > $@.n
+$x-tests: @MAINT@mk-script Test.pm
+	./mk-script ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
diff --git a/tests/md5sum/Makefile.am b/tests/md5sum/Makefile.am
index ca42dfd0c..2c04f0827 100644
--- a/tests/md5sum/Makefile.am
+++ b/tests/md5sum/Makefile.am
@@ -1,6 +1,4 @@
 ## Process this file with automake to produce Makefile.in.
 
-AUTOMAKE_OPTIONS = 1.1
-
 TESTS = md5-rfc
 EXTRA_DIST = $(TESTS)
diff --git a/tests/sort/Makefile.am b/tests/sort/Makefile.am
index 7e0f48ea8..c8212d9a2 100644
--- a/tests/sort/Makefile.am
+++ b/tests/sort/Makefile.am
@@ -1,7 +1,5 @@
 ## Process this file with automake to produce Makefile.in.
 
-AUTOMAKE_OPTIONS = 1.1
-
 x = sort
 t = \
   t01a t02a t02b t02c t02d t02e t02f t03a t03b t03c t03d t03e t03f t03g \
@@ -16,7 +14,7 @@ exp = $(t:=.exp)
 out = $(t:=.out)
 err = $(t:=.err)
 
-EXTRA_DIST = build-script.pl Test.pm $x-tests $(in) $(exp)
+EXTRA_DIST = mk-script.pl Test.pm $x-tests $(in) $(exp)
 noinst_SCRIPTS = $x-tests
 
 PERL = @PERL@
@@ -24,8 +22,8 @@ editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,@srcdir@,g'
 
 TESTS = $x-tests
 
-$x-tests: @MAINT@ build-script Test.pm
-	./build-script ../../src/$x > $@.n
+$x-tests: @MAINT@ mk-script Test.pm
+	./mk-script ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
diff --git a/tests/tr/Makefile.am b/tests/tr/Makefile.am
index 0740d81ef..cb71a4045 100644
--- a/tests/tr/Makefile.am
+++ b/tests/tr/Makefile.am
@@ -1,7 +1,5 @@
 ## Process this file with automake to produce Makefile.in.
 
-AUTOMAKE_OPTIONS = 1.1c
-
 x = tr
 t = \
   t1 t2 t3 t4 t5 t6 t7 t8 t9 tA tB tC tD tE tF tG tH tI tR0.0 tR0.1 tR1.0 \
@@ -13,7 +11,7 @@ exp = $(t:=.exp)
 out = $(t:=.out)
 err = $(t:=.err)
 
-EXTRA_DIST = build-script.pl Test.pm $x-tests $(in) $(exp)
+EXTRA_DIST = mk-script.pl Test.pm $x-tests $(in) $(exp)
 noinst_SCRIPTS = $x-tests
 
 PERL = @PERL@
@@ -21,8 +19,8 @@ editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,@srcdir@,g'
 
 TESTS = $x-tests
 
-$x-tests: @MAINT@ build-script Test.pm
-	./build-script ../../src/$x > $@.n
+$x-tests: @MAINT@mk-script Test.pm
+	./mk-script ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@