.

20 files changed, 50 insertions, 40 deletions

diff --git a/tests/cut/Makefile.am b/tests/cut/Makefile.am
index 8ec473241..3f002af16 100644
--- a/tests/cut/Makefile.am
+++ b/tests/cut/Makefile.am
@@ -27,7 +27,7 @@ TESTS = $x-tests
 
 mk_script = $(srcdir)/../mk-script
 $(srcdir)/$x-tests: $(mk_script) Test.pm
-	$(PERL) -w -- $(mk_script) ../../src/$x > $@.n
+	$(PERL) -I. -w -- $(mk_script) ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
@@ -39,6 +39,6 @@ Makefile.am: ../Makefile.am.in Test.pm $(mk_script)
 	sed -n '1,/^##test-files-begin/p' $< > $@t
 	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
 	  echo "x = $$tool" >> $@t
-	$(PERL) -w -- $(mk_script) --list >> $@t
+	$(PERL) -I. -w -- $(mk_script) --list >> $@t
 	sed -n '/^##test-files-end/,$$p' $< >> $@t
 	mv $@t $@
diff --git a/tests/cut/Makefile.in b/tests/cut/Makefile.in
index 12931b676..36d8477a4 100644
--- a/tests/cut/Makefile.in
+++ b/tests/cut/Makefile.in
@@ -67,6 +67,7 @@ GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
+INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -232,7 +233,7 @@ distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
 $(srcdir)/$x-tests: $(mk_script) Test.pm
-	$(PERL) -w -- $(mk_script) ../../src/$x > $@.n
+	$(PERL) -I. -w -- $(mk_script) ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
@@ -241,7 +242,7 @@ Makefile.am: ../Makefile.am.in Test.pm $(mk_script)
 	sed -n '1,/^##test-files-begin/p' $< > $@t
 	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
 	  echo "x = $$tool" >> $@t
-	$(PERL) -w -- $(mk_script) --list >> $@t
+	$(PERL) -I. -w -- $(mk_script) --list >> $@t
 	sed -n '/^##test-files-end/,$$p' $< >> $@t
 	mv $@t $@
 
diff --git a/tests/head/Makefile.am b/tests/head/Makefile.am
index a60494782..ae2c16946 100644
--- a/tests/head/Makefile.am
+++ b/tests/head/Makefile.am
@@ -26,7 +26,7 @@ TESTS = $x-tests
 
 mk_script = $(srcdir)/../mk-script
 $(srcdir)/$x-tests: $(mk_script) Test.pm
-	$(PERL) -w -- $(mk_script) ../../src/$x > $@.n
+	$(PERL) -I. -w -- $(mk_script) ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
@@ -38,6 +38,6 @@ Makefile.am: ../Makefile.am.in Test.pm $(mk_script)
 	sed -n '1,/^##test-files-begin/p' $< > $@t
 	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
 	  echo "x = $$tool" >> $@t
-	$(PERL) -w -- $(mk_script) --list >> $@t
+	$(PERL) -I. -w -- $(mk_script) --list >> $@t
 	sed -n '/^##test-files-end/,$$p' $< >> $@t
 	mv $@t $@
diff --git a/tests/head/Makefile.in b/tests/head/Makefile.in
index 52156930f..22a66fabd 100644
--- a/tests/head/Makefile.in
+++ b/tests/head/Makefile.in
@@ -67,6 +67,7 @@ GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
+INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -231,7 +232,7 @@ distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
 $(srcdir)/$x-tests: $(mk_script) Test.pm
-	$(PERL) -w -- $(mk_script) ../../src/$x > $@.n
+	$(PERL) -I. -w -- $(mk_script) ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
@@ -240,7 +241,7 @@ Makefile.am: ../Makefile.am.in Test.pm $(mk_script)
 	sed -n '1,/^##test-files-begin/p' $< > $@t
 	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
 	  echo "x = $$tool" >> $@t
-	$(PERL) -w -- $(mk_script) --list >> $@t
+	$(PERL) -I. -w -- $(mk_script) --list >> $@t
 	sed -n '/^##test-files-end/,$$p' $< >> $@t
 	mv $@t $@
 
diff --git a/tests/join/Makefile.am b/tests/join/Makefile.am
index 7d80fd7de..ea6d7d246 100644
--- a/tests/join/Makefile.am
+++ b/tests/join/Makefile.am
@@ -29,7 +29,7 @@ TESTS = $x-tests
 
 mk_script = $(srcdir)/../mk-script
 $(srcdir)/$x-tests: $(mk_script) Test.pm
-	$(PERL) -w -- $(mk_script) ../../src/$x > $@.n
+	$(PERL) -I. -w -- $(mk_script) ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
@@ -41,6 +41,6 @@ Makefile.am: ../Makefile.am.in Test.pm $(mk_script)
 	sed -n '1,/^##test-files-begin/p' $< > $@t
 	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
 	  echo "x = $$tool" >> $@t
-	$(PERL) -w -- $(mk_script) --list >> $@t
+	$(PERL) -I. -w -- $(mk_script) --list >> $@t
 	sed -n '/^##test-files-end/,$$p' $< >> $@t
 	mv $@t $@
diff --git a/tests/join/Makefile.in b/tests/join/Makefile.in
index fb8751b04..bc0b0bbe7 100644
--- a/tests/join/Makefile.in
+++ b/tests/join/Makefile.in
@@ -67,6 +67,7 @@ GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
+INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -234,7 +235,7 @@ distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
 $(srcdir)/$x-tests: $(mk_script) Test.pm
-	$(PERL) -w -- $(mk_script) ../../src/$x > $@.n
+	$(PERL) -I. -w -- $(mk_script) ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
@@ -243,7 +244,7 @@ Makefile.am: ../Makefile.am.in Test.pm $(mk_script)
 	sed -n '1,/^##test-files-begin/p' $< > $@t
 	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
 	  echo "x = $$tool" >> $@t
-	$(PERL) -w -- $(mk_script) --list >> $@t
+	$(PERL) -I. -w -- $(mk_script) --list >> $@t
 	sed -n '/^##test-files-end/,$$p' $< >> $@t
 	mv $@t $@
 
diff --git a/tests/md5sum/Makefile.am b/tests/md5sum/Makefile.am
index 0e1a3fca6..b983b942a 100644
--- a/tests/md5sum/Makefile.am
+++ b/tests/md5sum/Makefile.am
@@ -17,7 +17,7 @@ TESTS = $x-tests
 
 mk_script = $(srcdir)/../mk-script
 $(srcdir)/$x-tests: $(mk_script) Test.pm
-	$(PERL) -w -- $(mk_script) ../../src/$x > $@.n
+	$(PERL) -I. -w -- $(mk_script) ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
@@ -29,6 +29,6 @@ Makefile.am: ../Makefile.am.in Test.pm $(mk_script)
 	sed -n '1,/^##test-files-begin/p' $< > $@t
 	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
 	  echo "x = $$tool" >> $@t
-	$(PERL) -w -- $(mk_script) --list >> $@t
+	$(PERL) -I. -w -- $(mk_script) --list >> $@t
 	sed -n '/^##test-files-end/,$$p' $< >> $@t
 	mv $@t $@
diff --git a/tests/md5sum/Makefile.in b/tests/md5sum/Makefile.in
index 0b03b4f27..c43c18c80 100644
--- a/tests/md5sum/Makefile.in
+++ b/tests/md5sum/Makefile.in
@@ -67,6 +67,7 @@ GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
+INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -222,7 +223,7 @@ distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
 $(srcdir)/$x-tests: $(mk_script) Test.pm
-	$(PERL) -w -- $(mk_script) ../../src/$x > $@.n
+	$(PERL) -I. -w -- $(mk_script) ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
@@ -231,7 +232,7 @@ Makefile.am: ../Makefile.am.in Test.pm $(mk_script)
 	sed -n '1,/^##test-files-begin/p' $< > $@t
 	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
 	  echo "x = $$tool" >> $@t
-	$(PERL) -w -- $(mk_script) --list >> $@t
+	$(PERL) -I. -w -- $(mk_script) --list >> $@t
 	sed -n '/^##test-files-end/,$$p' $< >> $@t
 	mv $@t $@
 
diff --git a/tests/pr/Makefile.am b/tests/pr/Makefile.am
index c1293a2af..6b4cfe2af 100644
--- a/tests/pr/Makefile.am
+++ b/tests/pr/Makefile.am
@@ -69,7 +69,7 @@ TESTS = $x-tests
 
 mk_script = $(srcdir)/../mk-script
 $(srcdir)/$x-tests: $(mk_script) Test.pm
-	$(PERL) -w -- $(mk_script) ../../src/$x > $@.n
+	$(PERL) -I. -w -- $(mk_script) ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
@@ -81,6 +81,6 @@ Makefile.am: ../Makefile.am.in Test.pm $(mk_script)
 	sed -n '1,/^##test-files-begin/p' $< > $@t
 	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
 	  echo "x = $$tool" >> $@t
-	$(PERL) -w -- $(mk_script) --list >> $@t
+	$(PERL) -I. -w -- $(mk_script) --list >> $@t
 	sed -n '/^##test-files-end/,$$p' $< >> $@t
 	mv $@t $@
diff --git a/tests/pr/Makefile.in b/tests/pr/Makefile.in
index 3eaf74f63..1328c54bd 100644
--- a/tests/pr/Makefile.in
+++ b/tests/pr/Makefile.in
@@ -67,6 +67,7 @@ GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
+INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -274,7 +275,7 @@ distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
 $(srcdir)/$x-tests: $(mk_script) Test.pm
-	$(PERL) -w -- $(mk_script) ../../src/$x > $@.n
+	$(PERL) -I. -w -- $(mk_script) ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
@@ -283,7 +284,7 @@ Makefile.am: ../Makefile.am.in Test.pm $(mk_script)
 	sed -n '1,/^##test-files-begin/p' $< > $@t
 	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
 	  echo "x = $$tool" >> $@t
-	$(PERL) -w -- $(mk_script) --list >> $@t
+	$(PERL) -I. -w -- $(mk_script) --list >> $@t
 	sed -n '/^##test-files-end/,$$p' $< >> $@t
 	mv $@t $@
 
diff --git a/tests/sort/Makefile.am b/tests/sort/Makefile.am
index 17db66529..a072bbd19 100644
--- a/tests/sort/Makefile.am
+++ b/tests/sort/Makefile.am
@@ -49,7 +49,7 @@ TESTS = $x-tests
 
 mk_script = $(srcdir)/../mk-script
 $(srcdir)/$x-tests: $(mk_script) Test.pm
-	$(PERL) -w -- $(mk_script) ../../src/$x > $@.n
+	$(PERL) -I. -w -- $(mk_script) ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
@@ -61,6 +61,6 @@ Makefile.am: ../Makefile.am.in Test.pm $(mk_script)
 	sed -n '1,/^##test-files-begin/p' $< > $@t
 	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
 	  echo "x = $$tool" >> $@t
-	$(PERL) -w -- $(mk_script) --list >> $@t
+	$(PERL) -I. -w -- $(mk_script) --list >> $@t
 	sed -n '/^##test-files-end/,$$p' $< >> $@t
 	mv $@t $@
diff --git a/tests/sort/Makefile.in b/tests/sort/Makefile.in
index 27a1568ac..eb6a8422e 100644
--- a/tests/sort/Makefile.in
+++ b/tests/sort/Makefile.in
@@ -67,6 +67,7 @@ GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
+INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -254,7 +255,7 @@ distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
 $(srcdir)/$x-tests: $(mk_script) Test.pm
-	$(PERL) -w -- $(mk_script) ../../src/$x > $@.n
+	$(PERL) -I. -w -- $(mk_script) ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
@@ -263,7 +264,7 @@ Makefile.am: ../Makefile.am.in Test.pm $(mk_script)
 	sed -n '1,/^##test-files-begin/p' $< > $@t
 	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
 	  echo "x = $$tool" >> $@t
-	$(PERL) -w -- $(mk_script) --list >> $@t
+	$(PERL) -I. -w -- $(mk_script) --list >> $@t
 	sed -n '/^##test-files-end/,$$p' $< >> $@t
 	mv $@t $@
 
diff --git a/tests/tac/Makefile.am b/tests/tac/Makefile.am
index f5d063cb2..0d5139b5e 100644
--- a/tests/tac/Makefile.am
+++ b/tests/tac/Makefile.am
@@ -25,7 +25,7 @@ TESTS = $x-tests
 
 mk_script = $(srcdir)/../mk-script
 $(srcdir)/$x-tests: $(mk_script) Test.pm
-	$(PERL) -w -- $(mk_script) ../../src/$x > $@.n
+	$(PERL) -I. -w -- $(mk_script) ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
@@ -37,6 +37,6 @@ Makefile.am: ../Makefile.am.in Test.pm $(mk_script)
 	sed -n '1,/^##test-files-begin/p' $< > $@t
 	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
 	  echo "x = $$tool" >> $@t
-	$(PERL) -w -- $(mk_script) --list >> $@t
+	$(PERL) -I. -w -- $(mk_script) --list >> $@t
 	sed -n '/^##test-files-end/,$$p' $< >> $@t
 	mv $@t $@
diff --git a/tests/tac/Makefile.in b/tests/tac/Makefile.in
index 5a1557e68..f32a968b1 100644
--- a/tests/tac/Makefile.in
+++ b/tests/tac/Makefile.in
@@ -67,6 +67,7 @@ GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
+INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -230,7 +231,7 @@ distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
 $(srcdir)/$x-tests: $(mk_script) Test.pm
-	$(PERL) -w -- $(mk_script) ../../src/$x > $@.n
+	$(PERL) -I. -w -- $(mk_script) ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
@@ -239,7 +240,7 @@ Makefile.am: ../Makefile.am.in Test.pm $(mk_script)
 	sed -n '1,/^##test-files-begin/p' $< > $@t
 	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
 	  echo "x = $$tool" >> $@t
-	$(PERL) -w -- $(mk_script) --list >> $@t
+	$(PERL) -I. -w -- $(mk_script) --list >> $@t
 	sed -n '/^##test-files-end/,$$p' $< >> $@t
 	mv $@t $@
 
diff --git a/tests/tail/Makefile.am b/tests/tail/Makefile.am
index a421bf714..25157d9a6 100644
--- a/tests/tail/Makefile.am
+++ b/tests/tail/Makefile.am
@@ -31,7 +31,7 @@ TESTS = $x-tests
 
 mk_script = $(srcdir)/../mk-script
 $(srcdir)/$x-tests: $(mk_script) Test.pm
-	$(PERL) -w -- $(mk_script) ../../src/$x > $@.n
+	$(PERL) -I. -w -- $(mk_script) ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
@@ -43,6 +43,6 @@ Makefile.am: ../Makefile.am.in Test.pm $(mk_script)
 	sed -n '1,/^##test-files-begin/p' $< > $@t
 	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
 	  echo "x = $$tool" >> $@t
-	$(PERL) -w -- $(mk_script) --list >> $@t
+	$(PERL) -I. -w -- $(mk_script) --list >> $@t
 	sed -n '/^##test-files-end/,$$p' $< >> $@t
 	mv $@t $@
diff --git a/tests/tail/Makefile.in b/tests/tail/Makefile.in
index 699b5a9a9..cc396176e 100644
--- a/tests/tail/Makefile.in
+++ b/tests/tail/Makefile.in
@@ -67,6 +67,7 @@ GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
+INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -236,7 +237,7 @@ distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
 $(srcdir)/$x-tests: $(mk_script) Test.pm
-	$(PERL) -w -- $(mk_script) ../../src/$x > $@.n
+	$(PERL) -I. -w -- $(mk_script) ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
@@ -245,7 +246,7 @@ Makefile.am: ../Makefile.am.in Test.pm $(mk_script)
 	sed -n '1,/^##test-files-begin/p' $< > $@t
 	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
 	  echo "x = $$tool" >> $@t
-	$(PERL) -w -- $(mk_script) --list >> $@t
+	$(PERL) -I. -w -- $(mk_script) --list >> $@t
 	sed -n '/^##test-files-end/,$$p' $< >> $@t
 	mv $@t $@
 
diff --git a/tests/tr/Makefile.am b/tests/tr/Makefile.am
index f36378575..9644f9f02 100644
--- a/tests/tr/Makefile.am
+++ b/tests/tr/Makefile.am
@@ -33,7 +33,7 @@ TESTS = $x-tests
 
 mk_script = $(srcdir)/../mk-script
 $(srcdir)/$x-tests: $(mk_script) Test.pm
-	$(PERL) -w -- $(mk_script) ../../src/$x > $@.n
+	$(PERL) -I. -w -- $(mk_script) ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
@@ -45,6 +45,6 @@ Makefile.am: ../Makefile.am.in Test.pm $(mk_script)
 	sed -n '1,/^##test-files-begin/p' $< > $@t
 	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
 	  echo "x = $$tool" >> $@t
-	$(PERL) -w -- $(mk_script) --list >> $@t
+	$(PERL) -I. -w -- $(mk_script) --list >> $@t
 	sed -n '/^##test-files-end/,$$p' $< >> $@t
 	mv $@t $@
diff --git a/tests/tr/Makefile.in b/tests/tr/Makefile.in
index dcf5df224..e22889c5e 100644
--- a/tests/tr/Makefile.in
+++ b/tests/tr/Makefile.in
@@ -67,6 +67,7 @@ GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
+INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -238,7 +239,7 @@ distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
 $(srcdir)/$x-tests: $(mk_script) Test.pm
-	$(PERL) -w -- $(mk_script) ../../src/$x > $@.n
+	$(PERL) -I. -w -- $(mk_script) ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
@@ -247,7 +248,7 @@ Makefile.am: ../Makefile.am.in Test.pm $(mk_script)
 	sed -n '1,/^##test-files-begin/p' $< > $@t
 	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
 	  echo "x = $$tool" >> $@t
-	$(PERL) -w -- $(mk_script) --list >> $@t
+	$(PERL) -I. -w -- $(mk_script) --list >> $@t
 	sed -n '/^##test-files-end/,$$p' $< >> $@t
 	mv $@t $@
 
diff --git a/tests/wc/Makefile.am b/tests/wc/Makefile.am
index 081559f37..d2de4532f 100644
--- a/tests/wc/Makefile.am
+++ b/tests/wc/Makefile.am
@@ -21,7 +21,7 @@ TESTS = $x-tests
 
 mk_script = $(srcdir)/../mk-script
 $(srcdir)/$x-tests: $(mk_script) Test.pm
-	$(PERL) -w -- $(mk_script) ../../src/$x > $@.n
+	$(PERL) -I. -w -- $(mk_script) ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
@@ -33,6 +33,6 @@ Makefile.am: ../Makefile.am.in Test.pm $(mk_script)
 	sed -n '1,/^##test-files-begin/p' $< > $@t
 	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
 	  echo "x = $$tool" >> $@t
-	$(PERL) -w -- $(mk_script) --list >> $@t
+	$(PERL) -I. -w -- $(mk_script) --list >> $@t
 	sed -n '/^##test-files-end/,$$p' $< >> $@t
 	mv $@t $@
diff --git a/tests/wc/Makefile.in b/tests/wc/Makefile.in
index 21b11e402..24bdc4707 100644
--- a/tests/wc/Makefile.in
+++ b/tests/wc/Makefile.in
@@ -67,6 +67,7 @@ GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
+INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -226,7 +227,7 @@ distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
 $(srcdir)/$x-tests: $(mk_script) Test.pm
-	$(PERL) -w -- $(mk_script) ../../src/$x > $@.n
+	$(PERL) -I. -w -- $(mk_script) ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
@@ -235,7 +236,7 @@ Makefile.am: ../Makefile.am.in Test.pm $(mk_script)
 	sed -n '1,/^##test-files-begin/p' $< > $@t
 	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
 	  echo "x = $$tool" >> $@t
-	$(PERL) -w -- $(mk_script) --list >> $@t
+	$(PERL) -I. -w -- $(mk_script) --list >> $@t
 	sed -n '/^##test-files-end/,$$p' $< >> $@t
 	mv $@t $@