*** empty log message ***

diff --git a/src/Makefile.am b/src/Makefile.am
index 5226adf9f91715f7f58e5a1b5713a9d4be1d7394..729f4bf3d50a718ab6356cf156c0d1b9c2342841 100644 (file)
--- 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 f8aa099198324e9d74a95d15cc5730cd117d1c96..4d9a3f24acf37488ed90386c817bbd32edd432fa 100644 (file)
--- 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 c902f68fdfd41769544ede8514ba5a163c9febf1..60dcf7376ddc903f8cc31871d21cba7bf9b3d143 100644 (file)
--- 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 83df010f411a43cf38ea9fb50e1292a820528784..7d0af9f23f44158c8aac3534b389d514271fe95c 100644 (file)
--- 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 13be8e8c3cce1aa16adcee5c84339d5019f14ab3..794f4eb55d74fd6eb6c2fc17386c4e0ab4484d87 100644 (file)
--- 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 5da3e99f12b4fdd680064573fe1ec3c8380bddb8..ba7242c512cb4735a9cd337e66f9a17a8370b42e 100644 (file)
--- 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 e25a8d945961d974ab01e466b10ffe6cf10ab225..0c00494f6acab723231f5f0481206261f40c27ca 100644 (file)
--- 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 661507604fe56ca797203923e649fb63dd66493f..26414b13ac252f98c0ee3c476d130712d9e59ca7 100644 (file)
--- 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 f36008d24f0d20eb88f66b6f132fd3c332a7b22c..30aada06cfd71db94d127dc893a5ed5ef594a234 100644 (file)
--- 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 3c9938d919ffd54ce0bc34c5f8df1e9c3a607fca..3f58876720f5018983ec1f29e825ff82d69494aa 100644 (file)
--- 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 62f605f0bb6b689084a204d19f333e5ef048b8a6..b4113042cc4f088969834a630a62498149c5c29d 100644 (file)
--- 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 d2831b3631528ac678719bd3c1e157b9f1feeea9..9b0783d9936c9463f7e5d51834f92328cc305dbc 100644 (file)
--- 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 8875a2d20664cdbc1ae07743e10fd236c68e7fde..fc3f58a0cdcf571ee8367e454ac76964be4d7d1a 100644 (file)
--- 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 36a73d09f78acb5efe16344d90f6e273fd4805ea..b3d43782a2a155e1c19269ad8e6e31105b767d96 100644 (file)
--- 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 3a48a85fb050446279fac4ed3f9460bd2be9d6e7..cd438072750724390d1685c577ac0022367ca713 100644 (file)
--- 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 cb931c5c8bdedc2673a964ef692ee94ad1f9f1d3..3edd3690c0e096c8c52e6294008a4a9c7c5dae67 100644 (file)
--- 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 3c7a271e2d91631abc003de8bae7cf819ea9ed91..bae7ddaa69c8ac4fa47bf7a253bd20f771497ac3 100644 (file)
--- 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 6cae48b304f4ce35da464a63f68b46a9234f0901..d4bab014c0d26b29eda5880e7004ac4dd6606ad5 100644 (file)
--- 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 a4b09cefd0be0cdd628b9c6b402e84dbe485c053..46a8141d43ac63dcba7a17d2b9ad9b9995b9e47c 100644 (file)
--- 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 bf9bef405bcd5f2c5a86691b79f32b0346de254f..5884795a6520816442c220fff0a91aa125df0073 100644 (file)
--- 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 aad341e8ae34b497093aa143a564be3f8d1a5bb0..1c14628323243556cea9ea284177014f1fd9ef36 100644 (file)
--- 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 00fb29173319e336f5bc0f40118812f12b3eb0db..731de3e294b09be083c36800cb5588e01977c5c8 100644 (file)
--- 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 f70902e35e76a1d8b6d8e4842bba57ff7216d0dc..6a8335fe887e728e010e7544a40cadfbb9ec4f0b 100644 (file)
--- 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 b46da85eff2a13b02cb2ffc8b5920d08a312882c..b051538163703b516583f109ab6b5da2c6385dbf 100644 (file)
--- 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 7e18525f56cf2957b52a8697cb35e0115a2c8424..d5a96abe625f35e6ee65785f8f82cdc7a9cbd672 100644 (file)
--- 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 8a2c8a05d10ab680c0286048910ffee17403bac3..c034f2d4ad1cb389fe181786c2f1b6fc3036340f 100644 (file)
--- 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 2ab6e745d99a430632b5fe2b0621702515117f8a..92bcbb7b34af7a2ea203d0192a7411c523ad91f2 100644 (file)
--- 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 ed4d991b318e906af2dff9c60c1723fa8cdec7fc..62fd2517c152bf74a4c19da4ace8c23e479a12ef 100644 (file)
--- 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 ecbbc35b367bd3dbb713c0b2f932a312b11d0392..868ad0ca302cfb12fae55551b82ca2cd9425b05d 100644 (file)
--- 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 33fd1c96f18633ddc66ed13a103733e4d52f6447..61181d2d5031b8ff2ac8c68fa0de8d25ce772da6 100644 (file)
--- 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 debe62c0a721e102c4c1638302616ba4aa1c4b0b..9dbeb61d38480cdb662183bf306589b6d56fb0cd 100644 (file)
--- 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 145b5724979b8a79ee3afcea7d2371e6c9be47cc..e0d4a31b651fd77f79df9359863d0e9660da668b 100644 (file)
--- 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 64b87b458f753825ba27ebe2a930f53027bacc94..b9392cb3b7c0e5386ef932e3b804dbcf80cd5301 100644 (file)
--- 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 019e8e1a19a2b91c749eb03eab72afcd0431cb76..8efda62abda7b5d4ae4fdade60123c66159e5b8c 100644 (file)
--- 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 0a2675425178ac9a3a830877bb2eb416f9aed1fd..a32b7e0c01af9e883ca300eb931339e289e6085e 100644 (file)
--- 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 7ad899ee7b30baae63863dd3c05aec83cc2ccf01..8f5aec93c92613886609d0ee20f8ccb0e01a946f 100644 (file)
--- 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 96f447de538a77619036f90b45a53cc6d69792f9..7aae32f686ba4b7204df7fe2a38dc5212edf34c8 100644 (file)
--- 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 f64deae3f0dae27b2a115bdd0096cbda92427ab3..80daa2ed9a360b39b34326fd475fbd8c71c785c6 100644 (file)
--- 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 12b2463009de912fd7b7647e0de7245cc0f821bf..6f4405ccf046304426c99f8b458d0c6a9757a947 100644 (file)
--- 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 b301696b95e49559bffc4bc44f669a041139cdc5..55427c21137afcc1bc3df49b507b0a9e74c224cc 100644 (file)
--- 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 398d0fbc38d0db994483c0b6b3add1bf9a05d71a..518279c98f72f11946d02f9dbe285aa0675c0161 100644 (file)
--- 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 f781253add4e768682252da60f2311d1155e194f..858784dfc462bf3d744d411e9230f83c7fda7036 100644 (file)
--- 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 4492271b786d07800a8e0d05935d13514f10ba03..6822d5a01a1c750fa16fbf00fa3ef194eec701f4 100644 (file)
--- 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 d4cdf572893a8f10dd4b8d160801f5a352dd9b7e..68267133b84312b83240842f6fcd2380ef715267 100644 (file)
--- 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 ac209ece483cf09a36e38628c7b601ecfdac6d62..df0010e15b181d98e3842003b45d07ebfa3e8843 100644 (file)
--- 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