*** empty log message ***

45 files changed, 86 insertions, 86 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 5226adf9f..729f4bf3d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@
 EXTRA_PROGRAMS = chroot df hostid nice pinky stty su uname uptime users who
 EXTRA_SCRIPTS = nohup
 
-bin_SCRIPTS = groups @OPTIONAL_BIN_ZCRIPTS@
+bin_SCRIPTS = groups $(OPTIONAL_BIN_ZCRIPTS)
 bin_PROGRAMS = chgrp chown chmod cp dd dircolors du \
   ginstall link ln dir vdir ls mkdir \
   mkfifo mknod mv readlink rm rmdir shred stat sync touch unlink \
@@ -12,7 +12,7 @@ bin_PROGRAMS = chgrp chown chmod cp dd dircolors du \
   basename date dirname echo env expr factor false \
   hostname id kill logname pathchk printenv printf pwd seq sleep tee \
   test true tty whoami yes \
-  @OPTIONAL_BIN_PROGS@ @DF_PROG@
+  $(OPTIONAL_BIN_PROGS) $(DF_PROG)
 
 noinst_HEADERS = \
   system.h sys2.h checksum.h copy.h cp-hash.h ls.h dircolors.h remove.h \
@@ -24,45 +24,45 @@ CLEANFILES = $(SCRIPTS) su
 
 INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I../lib
 
-# Sometimes, the expansion of @LIBINTL@ includes -lc which may
+# Sometimes, the expansion of $(LIBINTL) includes -lc which may
 # include modules defining variables like `optind', so libfetish.a
-# must precede @LIBINTL@ in order to ensure we use GNU getopt.
-# But libfetish.a must also follow @LIBINTL@, since libintl uses
+# must precede $(LIBINTL) in order to ensure we use GNU getopt.
+# But libfetish.a must also follow $(LIBINTL), since libintl uses
 # replacement functions defined in libfetish.a.
-LDADD = ../lib/libfetish.a @LIBINTL@ ../lib/libfetish.a
+LDADD = ../lib/libfetish.a $(LIBINTL) ../lib/libfetish.a
 
-dir_LDADD = $(LDADD) @LIB_CLOCK_GETTIME@
-ls_LDADD = $(LDADD) @LIB_CLOCK_GETTIME@
-shred_LDADD = $(LDADD) @LIB_CLOCK_GETTIME@
-vdir_LDADD = $(LDADD) @LIB_CLOCK_GETTIME@
+dir_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
+ls_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
+shred_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
+vdir_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
 
 ## If necessary, add -lm to resolve use of pow in lib/strtod.c.
-sort_LDADD = $(LDADD) @POW_LIB@
+sort_LDADD = $(LDADD) $(POW_LIB)
 
 # for clock_gettime
-date_LDADD = $(LDADD) @LIB_CLOCK_GETTIME@
+date_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
 
 # For sqrt
-factor_LDADD = $(LDADD) @SQRT_LIBM@
+factor_LDADD = $(LDADD) $(SQRT_LIBM)
 
 # If necessary, add -lm to resolve use of pow in lib/strtod.c.
 # If necessary, add -liconv to resolve use of iconv in lib/unicodeio.c.
-printf_LDADD = $(LDADD) @POW_LIB@ @LIBICONV@
+printf_LDADD = $(LDADD) $(POW_LIB) $(LIBICONV)
 
 # If necessary, add -lm to resolve use of floor, rint, modf.
-seq_LDADD = $(LDADD) @SEQ_LIBM@
+seq_LDADD = $(LDADD) $(SEQ_LIBM)
 
 # If necessary, add -lm to resolve the `pow' reference in lib/strtod.c
 # or for the fesetround reference in programs using nanosec.c.
 nanosec_libs = \
-  $(LDADD) @FESETROUND_LIBM@ @POW_LIB@ @LIB_CLOCK_GETTIME@ @LIB_NANOSLEEP@
+  $(LDADD) $(FESETROUND_LIBM) $(POW_LIB) $(LIB_CLOCK_GETTIME) $(LIB_NANOSLEEP)
 
 sleep_LDADD = $(nanosec_libs)
 tail_LDADD = $(nanosec_libs)
 
-uptime_LDADD = $(LDADD) @GETLOADAVG_LIBS@
+uptime_LDADD = $(LDADD) $(GETLOADAVG_LIBS)
 
-su_LDADD = $(LDADD) @LIB_CRYPT@
+su_LDADD = $(LDADD) $(LIB_CRYPT)
 
 $(PROGRAMS): ../lib/libfetish.a
 
@@ -74,9 +74,9 @@ SUFFIXES = .sh
 	rm -f $@ $@-t
 	sed \
 	  -e 's!@''bindir''@!$(bindir)!' \
-	  -e 's/@''GNU_PACKAGE''@/@GNU_PACKAGE@/' \
-	  -e 's/@''PACKAGE_BUGREPORT''@/@PACKAGE_BUGREPORT@/' \
-	  -e 's/@''VERSION''@/@VERSION@/' $< > $@-t
+	  -e 's/@''GNU_PACKAGE''@/$(GNU_PACKAGE)/' \
+	  -e 's/@''PACKAGE_BUGREPORT''@/$(PACKAGE_BUGREPORT)/' \
+	  -e 's/@''VERSION''@/$(VERSION)/' $< > $@-t
 	chmod +x $@-t
 	mv $@-t $@
 
@@ -118,7 +118,7 @@ install-exec-local: su$(EXEEXT)
 
 uninstall-local:
 # Remove su only if it's one we installed.
-	@if grep '@GNU_PACKAGE@' $(installed_su) > /dev/null 2>&1; then \
+	@if grep '$(GNU_PACKAGE)' $(installed_su) > /dev/null 2>&1; then \
 	  echo "  rm -f $(installed_su)"; \
 	  rm -f $(installed_su); \
 	else :; fi
diff --git a/tests/basename/Makefile.am b/tests/basename/Makefile.am
index f8aa09919..4d9a3f24a 100644
--- a/tests/basename/Makefile.am
+++ b/tests/basename/Makefile.am
@@ -6,6 +6,6 @@ EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
-  PERL="@PERL@" \
-  PATH="`pwd`/../../src@PATH_SEPARATOR@$$PATH" \
+  PERL="$(PERL)" \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=basename
diff --git a/tests/chgrp/Makefile.am b/tests/chgrp/Makefile.am
index c902f68fd..60dcf7376 100644
--- a/tests/chgrp/Makefile.am
+++ b/tests/chgrp/Makefile.am
@@ -4,4 +4,4 @@ AUTOMAKE_OPTIONS = 1.4 gnits
 TESTS = basic deref recurse
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
-  PATH="`pwd`/../../src@PATH_SEPARATOR@$$PATH"
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
diff --git a/tests/chmod/Makefile.am b/tests/chmod/Makefile.am
index 83df010f4..7d0af9f23 100644
--- a/tests/chmod/Makefile.am
+++ b/tests/chmod/Makefile.am
@@ -4,4 +4,4 @@ AUTOMAKE_OPTIONS = 1.4 gnits
 TESTS = equals equal-x c-option setgid
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
-  PATH="`pwd`/../../src@PATH_SEPARATOR@$$PATH"
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
diff --git a/tests/chown/Makefile.am b/tests/chown/Makefile.am
index 13be8e8c3..794f4eb55 100644
--- a/tests/chown/Makefile.am
+++ b/tests/chown/Makefile.am
@@ -4,4 +4,4 @@ AUTOMAKE_OPTIONS = 1.4 gnits
 TESTS = basic
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
-  PATH="`pwd`/../../src@PATH_SEPARATOR@$$PATH"
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
diff --git a/tests/cp/Makefile.am b/tests/cp/Makefile.am
index 5da3e99f1..ba7242c51 100644
--- a/tests/cp/Makefile.am
+++ b/tests/cp/Makefile.am
@@ -10,4 +10,4 @@ TESTS = \
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   MAKE=$(MAKE) \
-  PATH="`pwd`/../../src@PATH_SEPARATOR@$$PATH"
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
diff --git a/tests/cut/Makefile.am b/tests/cut/Makefile.am
index e25a8d945..0c00494f6 100644
--- a/tests/cut/Makefile.am
+++ b/tests/cut/Makefile.am
@@ -28,7 +28,7 @@ out-delim5.O out-delim5.E
 EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
 
-PERL = @PERL@
+PERL = $(PERL)
 editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,@srcdir@,g'
 
 TESTS = $x-tests
diff --git a/tests/date/Makefile.am b/tests/date/Makefile.am
index 661507604..26414b13a 100644
--- a/tests/date/Makefile.am
+++ b/tests/date/Makefile.am
@@ -31,7 +31,7 @@ relative-2.O relative-2.E wide-fmt.O wide-fmt.E
 EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
 
-PERL = @PERL@
+PERL = $(PERL)
 editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,@srcdir@,g'
 
 TESTS = $x-tests
diff --git a/tests/dd/Makefile.am b/tests/dd/Makefile.am
index f36008d24..30aada06c 100644
--- a/tests/dd/Makefile.am
+++ b/tests/dd/Makefile.am
@@ -5,8 +5,8 @@ EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
-  PERL="@PERL@" \
-  PATH="`pwd`/../../src@PATH_SEPARATOR@$$PATH" \
+  PERL="$(PERL)" \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=dd
 
 TESTS = misc not-rewound skip-seek skip-seek2
diff --git a/tests/dircolors/Makefile.am b/tests/dircolors/Makefile.am
index 3c9938d91..3f5887672 100644
--- a/tests/dircolors/Makefile.am
+++ b/tests/dircolors/Makefile.am
@@ -5,8 +5,8 @@ EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
-  PERL="@PERL@" \
-  PATH="`pwd`/../../src@PATH_SEPARATOR@$$PATH" \
+  PERL="$(PERL)" \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=dircolors
 
 TESTS = simple
diff --git a/tests/du/Makefile.am b/tests/du/Makefile.am
index 62f605f0b..b4113042c 100644
--- a/tests/du/Makefile.am
+++ b/tests/du/Makefile.am
@@ -6,4 +6,4 @@ TESTS = \
   exclude no-x no-deref trailing-slash deref two-args slink
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
-  PATH="`pwd`/../../src@PATH_SEPARATOR@$$PATH"
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
diff --git a/tests/expr/Makefile.am b/tests/expr/Makefile.am
index d2831b363..9b0783d99 100644
--- a/tests/expr/Makefile.am
+++ b/tests/expr/Makefile.am
@@ -6,6 +6,6 @@ EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
-  PERL="@PERL@" \
-  PATH="`pwd`/../../src@PATH_SEPARATOR@$$PATH" \
+  PERL="$(PERL)" \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=expr
diff --git a/tests/factor/Makefile.am b/tests/factor/Makefile.am
index 8875a2d20..fc3f58a0c 100644
--- a/tests/factor/Makefile.am
+++ b/tests/factor/Makefile.am
@@ -6,6 +6,6 @@ EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
-  PERL="@PERL@" \
-  PATH="`pwd`/../../src@PATH_SEPARATOR@$$PATH" \
+  PERL="$(PERL)" \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=factor
diff --git a/tests/fmt/Makefile.am b/tests/fmt/Makefile.am
index 36a73d09f..b3d43782a 100644
--- a/tests/fmt/Makefile.am
+++ b/tests/fmt/Makefile.am
@@ -5,8 +5,8 @@ EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
-  PERL="@PERL@" \
-  PATH="`pwd`/../../src@PATH_SEPARATOR@$$PATH" \
+  PERL="$(PERL)" \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=fmt
 
 TESTS = basic long-line
diff --git a/tests/general/Makefile.am b/tests/general/Makefile.am
index 3a48a85fb..cd4380727 100644
--- a/tests/general/Makefile.am
+++ b/tests/general/Makefile.am
@@ -25,7 +25,7 @@ SUITE = suite.at dd.at m4sh.at
 EXTRA_DIST = $(SUITE) testsuite
 
 TESTS_ENVIRONMENT = \
-  PATH="`pwd`/../../src@PATH_SEPARATOR@$$PATH"
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
 
 TESTS = testsuite
 
diff --git a/tests/head/Makefile.am b/tests/head/Makefile.am
index cb931c5c8..3edd3690c 100644
--- a/tests/head/Makefile.am
+++ b/tests/head/Makefile.am
@@ -21,7 +21,7 @@ posix-3.O posix-3.E posix-4.O posix-4.E posix-5.O posix-5.E
 EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
 
-PERL = @PERL@
+PERL = $(PERL)
 editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,@srcdir@,g'
 
 TESTS = $x-tests
diff --git a/tests/install/Makefile.am b/tests/install/Makefile.am
index 3c7a271e2..bae7ddaa6 100644
--- a/tests/install/Makefile.am
+++ b/tests/install/Makefile.am
@@ -4,4 +4,4 @@ AUTOMAKE_OPTIONS = 1.3 gnits
 TESTS = basic-1 create-leading
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
-  PATH="`pwd`/../../src@PATH_SEPARATOR@$$PATH"
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
diff --git a/tests/join/Makefile.am b/tests/join/Makefile.am
index 6cae48b30..d4bab014c 100644
--- a/tests/join/Makefile.am
+++ b/tests/join/Makefile.am
@@ -24,7 +24,7 @@ trailing-sp.E sp-vs-blank.O sp-vs-blank.E 8-bit-t.O 8-bit-t.E
 EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
 
-PERL = @PERL@
+PERL = $(PERL)
 editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,@srcdir@,g'
 
 TESTS = $x-tests
diff --git a/tests/ln/Makefile.am b/tests/ln/Makefile.am
index a4b09cefd..46a8141d4 100644
--- a/tests/ln/Makefile.am
+++ b/tests/ln/Makefile.am
@@ -4,4 +4,4 @@ AUTOMAKE_OPTIONS = 1.2 gnits
 TESTS = target-1 sf-1 misc backup-1
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
-  PATH="`pwd`/../../src@PATH_SEPARATOR@$$PATH"
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
diff --git a/tests/ls-2/Makefile.am b/tests/ls-2/Makefile.am
index bf9bef405..5884795a6 100644
--- a/tests/ls-2/Makefile.am
+++ b/tests/ls-2/Makefile.am
@@ -5,8 +5,8 @@ EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
-  PERL="@PERL@" \
-  PATH="`pwd`/../../src@PATH_SEPARATOR@$$PATH" \
+  PERL="$(PERL)" \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=ls
 
 TESTS = tests
diff --git a/tests/ls/Makefile.am b/tests/ls/Makefile.am
index aad341e8a..1c1462832 100644
--- a/tests/ls/Makefile.am
+++ b/tests/ls/Makefile.am
@@ -10,5 +10,5 @@ EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
-  PATH="`pwd`/../../src@PATH_SEPARATOR@$$PATH" \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=ls
diff --git a/tests/md5sum/Makefile.am b/tests/md5sum/Makefile.am
index 00fb29173..731de3e29 100644
--- a/tests/md5sum/Makefile.am
+++ b/tests/md5sum/Makefile.am
@@ -5,8 +5,8 @@ EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
-  PERL="@PERL@" \
-  PATH="`pwd`/../../src@PATH_SEPARATOR@$$PATH" \
+  PERL="$(PERL)" \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=md5sum
 
 TESTS = basic-1 newline-1
diff --git a/tests/misc/Makefile.am b/tests/misc/Makefile.am
index f70902e35..6a8335fe8 100644
--- a/tests/misc/Makefile.am
+++ b/tests/misc/Makefile.am
@@ -5,8 +5,8 @@ EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
-  PERL="@PERL@" \
-  PATH="`pwd`/../../src@PATH_SEPARATOR@$$PATH" \
+  PERL="$(PERL)" \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=$$tst
 
 TESTS = \
diff --git a/tests/mkdir/Makefile.am b/tests/mkdir/Makefile.am
index b46da85ef..b05153816 100644
--- a/tests/mkdir/Makefile.am
+++ b/tests/mkdir/Makefile.am
@@ -5,4 +5,4 @@ TESTS = p-1 p-2 special-1 perm parents t-slash
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   srcdir=$(srcdir) \
-  PATH="`pwd`/../../src@PATH_SEPARATOR@$$PATH"
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
diff --git a/tests/mv/Makefile.am b/tests/mv/Makefile.am
index 7e18525f5..d5a96abe6 100644
--- a/tests/mv/Makefile.am
+++ b/tests/mv/Makefile.am
@@ -16,6 +16,6 @@ TESTS = \
 
 EXTRA_DIST = $(TESTS) setup
 TESTS_ENVIRONMENT = \
-  PERL="@PERL@" \
-  PATH="`pwd`/../../src@PATH_SEPARATOR@$$PATH" \
+  PERL="$(PERL)" \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=mv
diff --git a/tests/od/Makefile.am b/tests/od/Makefile.am
index 8a2c8a05d..c034f2d4a 100644
--- a/tests/od/Makefile.am
+++ b/tests/od/Makefile.am
@@ -5,7 +5,7 @@ EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
-  PERL="@PERL@" \
-  PATH="`pwd`/../../src@PATH_SEPARATOR@$$PATH"
+  PERL="$(PERL)" \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
 
 TESTS = od-N x8
diff --git a/tests/pr/Makefile.am b/tests/pr/Makefile.am
index 2ab6e745d..92bcbb7b3 100644
--- a/tests/pr/Makefile.am
+++ b/tests/pr/Makefile.am
@@ -73,7 +73,7 @@ dbl-sp-a.E dbl-sp-b.O dbl-sp-b.E narrow-1.O narrow-1.E col-last.O col-last.E
 EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
 
-PERL = @PERL@
+PERL = $(PERL)
 editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,@srcdir@,g'
 
 TESTS = $x-tests
diff --git a/tests/rm/Makefile.am b/tests/rm/Makefile.am
index ed4d991b3..62fd2517c 100644
--- a/tests/rm/Makefile.am
+++ b/tests/rm/Makefile.am
@@ -13,6 +13,6 @@ TESTS_ENVIRONMENT = \
   MKDIR=../../src/mkdir \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
-  PERL="@PERL@" \
-  PATH="`pwd`/../../src@PATH_SEPARATOR@$$PATH" \
+  PERL="$(PERL)" \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=rm
diff --git a/tests/rmdir/Makefile.am b/tests/rmdir/Makefile.am
index ecbbc35b3..868ad0ca3 100644
--- a/tests/rmdir/Makefile.am
+++ b/tests/rmdir/Makefile.am
@@ -7,6 +7,6 @@ EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
-  PERL="@PERL@" \
-  PATH="`pwd`/../../src@PATH_SEPARATOR@$$PATH" \
+  PERL="$(PERL)" \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=rmdir
diff --git a/tests/seq/Makefile.am b/tests/seq/Makefile.am
index 33fd1c96f..61181d2d5 100644
--- a/tests/seq/Makefile.am
+++ b/tests/seq/Makefile.am
@@ -6,6 +6,6 @@ EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
-  PERL="@PERL@" \
-  PATH="`pwd`/../../src@PATH_SEPARATOR@$$PATH" \
+  PERL="$(PERL)" \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=seq
diff --git a/tests/sha1sum/Makefile.am b/tests/sha1sum/Makefile.am
index debe62c0a..9dbeb61d3 100644
--- a/tests/sha1sum/Makefile.am
+++ b/tests/sha1sum/Makefile.am
@@ -5,8 +5,8 @@ EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
-  PERL="@PERL@" \
-  PATH="`pwd`/../../src@PATH_SEPARATOR@$$PATH" \
+  PERL="$(PERL)" \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=sha1sum
 
 TESTS = basic-1 sample-vec
diff --git a/tests/shred/Makefile.am b/tests/shred/Makefile.am
index 145b57249..e0d4a31b6 100644
--- a/tests/shred/Makefile.am
+++ b/tests/shred/Makefile.am
@@ -5,7 +5,7 @@ EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
-  PERL="@PERL@" \
-  PATH="`pwd`/../../src@PATH_SEPARATOR@$$PATH"
+  PERL="$(PERL)" \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
 
 TESTS = remove exact
diff --git a/tests/sort/Makefile.am b/tests/sort/Makefile.am
index 64b87b458..b9392cb3b 100644
--- a/tests/sort/Makefile.am
+++ b/tests/sort/Makefile.am
@@ -45,7 +45,7 @@ nul-nls.E use-nl.O use-nl.E
 EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
 
-PERL = @PERL@
+PERL = $(PERL)
 editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,@srcdir@,g'
 
 TESTS = $x-tests
diff --git a/tests/stty/Makefile.am b/tests/stty/Makefile.am
index 019e8e1a1..8efda62ab 100644
--- a/tests/stty/Makefile.am
+++ b/tests/stty/Makefile.am
@@ -4,4 +4,4 @@ AUTOMAKE_OPTIONS = 1.2f gnits
 TESTS = row-col-1 basic-1
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
-  PATH="`pwd`/../../src@PATH_SEPARATOR@$$PATH"
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
diff --git a/tests/sum/Makefile.am b/tests/sum/Makefile.am
index 0a2675425..a32b7e0c0 100644
--- a/tests/sum/Makefile.am
+++ b/tests/sum/Makefile.am
@@ -5,8 +5,8 @@ EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
-  PERL="@PERL@" \
-  PATH="`pwd`/../../src@PATH_SEPARATOR@$$PATH" \
+  PERL="$(PERL)" \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=sum
 
 TESTS = basic-1 sysv
diff --git a/tests/tac/Makefile.am b/tests/tac/Makefile.am
index 7ad899ee7..8f5aec93c 100644
--- a/tests/tac/Makefile.am
+++ b/tests/tac/Makefile.am
@@ -22,7 +22,7 @@ opt-br.O opt-br.E opt-br2.O opt-br2.E
 EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
 
-PERL = @PERL@
+PERL = $(PERL)
 editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,@srcdir@,g'
 
 TESTS = $x-tests
diff --git a/tests/tail-2/Makefile.am b/tests/tail-2/Makefile.am
index 96f447de5..7aae32f68 100644
--- a/tests/tail-2/Makefile.am
+++ b/tests/tail-2/Makefile.am
@@ -5,8 +5,8 @@ EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
-  PERL="@PERL@" \
-  PATH="`pwd`/../../src@PATH_SEPARATOR@$$PATH" \
+  PERL="$(PERL)" \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=tail
 
 TESTS = big-4gb proc-ksyms start-middle assert assert-2
diff --git a/tests/tail/Makefile.am b/tests/tail/Makefile.am
index f64deae3f..80daa2ed9 100644
--- a/tests/tail/Makefile.am
+++ b/tests/tail/Makefile.am
@@ -24,7 +24,7 @@ n-5.E n-5a.O n-5a.E n-5b.O n-5b.E
 EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
 
-PERL = @PERL@
+PERL = $(PERL)
 editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,@srcdir@,g'
 
 TESTS = $x-tests
diff --git a/tests/test/Makefile.am b/tests/test/Makefile.am
index 12b246300..6f4405ccf 100644
--- a/tests/test/Makefile.am
+++ b/tests/test/Makefile.am
@@ -45,7 +45,7 @@ lt-3.O lt-3.E lt-4.O lt-4.E inv-1.O inv-1.E t1.O t1.E t2.O t2.E
 EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
 
-PERL = @PERL@
+PERL = $(PERL)
 editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,@srcdir@,g'
 
 TESTS = $x-tests
diff --git a/tests/touch/Makefile.am b/tests/touch/Makefile.am
index b301696b9..55427c211 100644
--- a/tests/touch/Makefile.am
+++ b/tests/touch/Makefile.am
@@ -8,4 +8,4 @@ TESTS = \
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   host_triplet=$(host_triplet) \
-  PATH="`pwd`/../../src@PATH_SEPARATOR@$$PATH"
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
diff --git a/tests/tr/Makefile.am b/tests/tr/Makefile.am
index 398d0fbc3..518279c98 100644
--- a/tests/tr/Makefile.am
+++ b/tests/tr/Makefile.am
@@ -28,7 +28,7 @@ empty-eq.E empty-cc.O empty-cc.E
 EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
 
-PERL = @PERL@
+PERL = $(PERL)
 editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,@srcdir@,g'
 
 TESTS = $x-tests
diff --git a/tests/tsort/Makefile.am b/tests/tsort/Makefile.am
index f781253ad..858784dfc 100644
--- a/tests/tsort/Makefile.am
+++ b/tests/tsort/Makefile.am
@@ -5,8 +5,8 @@ EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
-  PERL="@PERL@" \
-  PATH="`pwd`/../../src@PATH_SEPARATOR@$$PATH" \
+  PERL="$(PERL)" \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=tsort
 
 TESTS = basic-1
diff --git a/tests/unexpand/Makefile.am b/tests/unexpand/Makefile.am
index 4492271b7..6822d5a01 100644
--- a/tests/unexpand/Makefile.am
+++ b/tests/unexpand/Makefile.am
@@ -5,8 +5,8 @@ EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
-  PERL="@PERL@" \
-  PATH="`pwd`/../../src@PATH_SEPARATOR@$$PATH" \
+  PERL="$(PERL)" \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=unexpand
 
 TESTS = basic-1
diff --git a/tests/uniq/Makefile.am b/tests/uniq/Makefile.am
index d4cdf5728..68267133b 100644
--- a/tests/uniq/Makefile.am
+++ b/tests/uniq/Makefile.am
@@ -26,7 +26,7 @@ obs45.E 50.O 50.E 51.O 51.E 52.O 52.E 53.O 53.E 54.O 54.E 55.O 55.E 56.O 56.E \
 EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
 
-PERL = @PERL@
+PERL = $(PERL)
 editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,@srcdir@,g'
 
 TESTS = $x-tests
diff --git a/tests/wc/Makefile.am b/tests/wc/Makefile.am
index ac209ece4..df0010e15 100644
--- a/tests/wc/Makefile.am
+++ b/tests/wc/Makefile.am
@@ -14,7 +14,7 @@ c2.O c2.E
 EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
 
-PERL = @PERL@
+PERL = $(PERL)
 editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,@srcdir@,g'
 
 TESTS = $x-tests