.

diff --git a/ChangeLog b/ChangeLog
index 29a2e1a..fd2a98b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 
        * Version 5.0.1.
 
+       * Makefile.am (nearly all of them):
+       Use $(VAR) rather than @VAR@, now that we can rely on automake to
+       emit a definition for each substituted variable.
+
        * tests/rm/rm5: Add a comment explaining why this test fails when
        using Tru64's broken sed.
        * tests/rm/rm3: Likewise.

diff --git a/config.hin b/config.hin
index 312b40f..2bdf782 100644 (file)
--- a/config.hin
+++ b/config.hin
@@ -323,6 +323,10 @@
    don't. */
 #undef HAVE_DECL___FPENDING
 
+/* Define to 1 if you have the declaration of `__sys_siglist', and to 0 if you
+   don't. */
+#undef HAVE_DECL___SYS_SIGLIST
+
 /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
    */
 #undef HAVE_DIRENT_H

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 39a6240..493a500 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -160,6 +160,8 @@ target_alias = @target_alias@
 info_TEXINFOS = coreutils.texi
 
 EXTRA_DIST = perm.texi getdate.texi constants.texi doclicense.texi
+
+MAINTAINERCLEANFILES = constants.texi
 subdir = doc
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -344,6 +346,7 @@ distclean-generic:
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
        @echo "it deletes files that may require special tools to rebuild."
+       -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
 clean-am: clean-generic mostlyclean-am
@@ -426,18 +429,12 @@ uninstall-am: uninstall-info-am
        pdf-am ps ps-am uninstall uninstall-am uninstall-info-am
 
 
-# Remove `DISABLED_' when fileutils, textutils, and sh-utils have
-# all been merged into one package.
-DISABLED_constants.texi: $(top_srcdir)/src/tail.c
+constants.texi: $(top_srcdir)/src/tail.c
        LC_ALL=C \
        sed -n -e 's/^#define \(DEFAULT_MAX[_A-Z]*\) \(.*\)/@set \1 \2/p' \
          $(top_srcdir)/src/tail.c > t-$@
        mv t-$@ $@
 
-# Uncomment this when fileutils, textutils, and sh-utils have
-# all been merged into one package.
-# MAINTAINERCLEANFILES = constants.texi
-
 $(DVIS): $(EXTRA_DIST)
 $(INFO_DEPS): $(EXTRA_DIST)
 

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 423fc85..50c5ee8 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -54,7 +54,7 @@ CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DEFS = -DLIBDIR=\"$(libdir)\" @DEFS@
+DEFS = @DEFS@ -DLIBDIR=\"$(libdir)\"
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
 ECHO_C = @ECHO_C@
@@ -258,7 +258,7 @@ libfetish_a_SOURCES = \
   yesno.c
 
 
-libfetish_a_LIBADD = @LIBOBJS@ @ALLOCA@
+libfetish_a_LIBADD = $(LIBOBJS) $(ALLOCA)
 libfetish_a_DEPENDENCIES = $(libfetish_a_LIBADD)
 
 BUILT_SOURCES = getdate.c
@@ -846,7 +846,7 @@ charset.alias: config.charset
        $(SHELL) $(srcdir)/config.charset '@host@' > t-$@
        mv t-$@ $@
 .sin.sed:
-       sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $< > t-$@
+       sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > t-$@
        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/man/Makefile.in b/man/Makefile.in
index c59a09f..8c031e2 100644 (file)
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -479,7 +479,7 @@ check-local: check-x-vs-1
 # corresponding .1 file in the definition of $(dist_man_MANS) above.
 .PHONY: check-x-vs-1
 check-x-vs-1:
-       PATH=../src@PATH_SEPARATOR@$$PATH; export PATH;                 \
+       PATH=../src$(PATH_SEPARATOR)$$PATH; export PATH;                        \
        t=ls-files.$$$$;                                                \
        (cd $(srcdir) && ls -1 *.x) | sed 's/\.x$$//' | sort > $$t;     \
        echo $(dist_man_MANS) | fmt -w1 | sed 's/\.1$$//' | sort -u     \

diff --git a/src/Makefile.in b/src/Makefile.in
index c9154c6..546c7bf 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -56,7 +56,7 @@ CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DEFS = -DLOCALEDIR=\"$(localedir)\" -DSHAREDIR=\"$(datadir)\" @DEFS@
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
 ECHO_C = @ECHO_C@
@@ -104,7 +104,6 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-
 PERL = @PERL@
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
@@ -158,7 +157,7 @@ target_alias = @target_alias@
 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 \
@@ -167,10 +166,8 @@ 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)
 
-localedir = $(datadir)/locale
 
 noinst_HEADERS = \
   system.h sys2.h checksum.h copy.h cp-hash.h ls.h dircolors.h remove.h \
@@ -184,45 +181,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)
 
-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)
 
 SUFFIXES = .sh
 
@@ -253,20 +250,22 @@ rm_SOURCES = rm.c remove.c
 
 md5sum_SOURCES = md5sum.c md5.c
 sha1sum_SOURCES = md5sum.c sha1sum.c
+
 editpl = sed -e 's,@''PERL''@,$(PERL),g'
 
-MAINTAINERCLEANFILES = dircolors.h \
-  wheel.h wheel-size.h
+localedir = $(datadir)/locale
 
+BUILT_SOURCES = localedir.h dircolors.h wheel-size.h wheel.h false.c
+DISTCLEANFILES = localedir.h
 
 wheel_size = 5
 
-BUILT_SOURCES = dircolors.h false.c wheel.h wheel-size.h
-
 # false exits nonzero even with --help or --version.
 # Tell automake to exempt it from that installcheck test.
 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = false
 
+MAINTAINERCLEANFILES = $(BUILT_SOURCES)
+
 all_programs = \
     $(bin_PROGRAMS) \
     $(bin_SCRIPTS) \
@@ -1396,6 +1395,7 @@ clean-generic:
 
 distclean-generic:
        -rm -f Makefile $(CONFIG_CLEAN_FILES)
+       -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
@@ -1472,9 +1472,9 @@ $(SCRIPTS): Makefile
        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 $@
 
@@ -1501,32 +1501,38 @@ 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
-
+localedir.h: Makefile
+       @rm -f $@-t
+       echo '#define LOCALEDIR "$(localedir)"' >$@-t
+       @chmod a-w $@-t
+       cmp $@-t $@ 2>&1 > /dev/null && rm -f $@-t || { rm -f $@; mv $@-t $@; }
 dircolors.h: dcgen dircolors.hin
+       @rm -f $@ $@-t
        $(PERL) -w -- $(srcdir)/dcgen $(srcdir)/dircolors.hin > $@-t
+       @chmod a-w $@-t
        mv $@-t $@
-
 wheel-size.h: Makefile.am
+       @rm -f $@ $@-t
        echo '#define WHEEL_SIZE $(wheel_size)' > $@-t
+       @chmod a-w $@-t
        mv $@-t $@
-
 wheel.h: wheel-gen.pl Makefile.am
-       $(srcdir)/wheel-gen.pl $(wheel_size) \
-         > $@-t
+       @rm -f $@ $@-t
+       $(srcdir)/wheel-gen.pl $(wheel_size) > $@-t
+       @chmod a-w $@-t
        mv $@-t $@
-
 false.c: true.c
-       rm -f $@
+       @rm -f $@ $@-t
        sed \
          -e s/true/false/g \
          -e s/success/failure/g \
          -e 's/(EXIT_SUCCESS)/(EXIT_FAILURE)/g' \
          $(srcdir)/true.c > $@-t
-       chmod a-w $@-t
+       @chmod a-w $@-t
        mv $@-t $@
 # Ensure that the list of programs in README matches the list
 # of programs we can build.

diff --git a/tests/basename/Makefile.in b/tests/basename/Makefile.in
index 9cc773b..abbeabd 100644 (file)
--- a/tests/basename/Makefile.in
+++ b/tests/basename/Makefile.in
@@ -155,8 +155,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=basename
 
 subdir = tests/basename

diff --git a/tests/chgrp/Makefile.in b/tests/chgrp/Makefile.in
index 6f3d8eb..0941a63 100644 (file)
--- a/tests/chgrp/Makefile.in
+++ b/tests/chgrp/Makefile.in
@@ -153,7 +153,7 @@ 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"
 
 subdir = tests/chgrp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

diff --git a/tests/chmod/Makefile.in b/tests/chmod/Makefile.in
index 6bca1c8..133b286 100644 (file)
--- a/tests/chmod/Makefile.in
+++ b/tests/chmod/Makefile.in
@@ -153,7 +153,7 @@ 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"
 
 subdir = tests/chmod
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

diff --git a/tests/chown/Makefile.in b/tests/chown/Makefile.in
index 0bd10b0..cb5f49b 100644 (file)
--- a/tests/chown/Makefile.in
+++ b/tests/chown/Makefile.in
@@ -153,7 +153,7 @@ AUTOMAKE_OPTIONS = 1.4 gnits
 TESTS = basic
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
-  PATH="`pwd`/../../src@PATH_SEPARATOR@$$PATH"
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
 
 subdir = tests/chown
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

diff --git a/tests/cp/Makefile.in b/tests/cp/Makefile.in
index a9c1611..b429cb3 100644 (file)
--- a/tests/cp/Makefile.in
+++ b/tests/cp/Makefile.in
@@ -160,7 +160,7 @@ TESTS = \
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   MAKE=$(MAKE) \
-  PATH="`pwd`/../../src@PATH_SEPARATOR@$$PATH"
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
 
 subdir = tests/cp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

diff --git a/tests/cut/Makefile.in b/tests/cut/Makefile.in
index 3f61d51..88e0821 100644 (file)
--- a/tests/cut/Makefile.in
+++ b/tests/cut/Makefile.in
@@ -100,7 +100,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 
-PERL = @PERL@
+PERL = $(PERL)
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
 RANLIB = @RANLIB@

diff --git a/tests/date/Makefile.in b/tests/date/Makefile.in
index ce9066f..88ec0ef 100644 (file)
--- a/tests/date/Makefile.in
+++ b/tests/date/Makefile.in
@@ -100,7 +100,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 
-PERL = @PERL@
+PERL = $(PERL)
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
 RANLIB = @RANLIB@

diff --git a/tests/dd/Makefile.in b/tests/dd/Makefile.in
index 272a91d..afcbb2f 100644 (file)
--- a/tests/dd/Makefile.in
+++ b/tests/dd/Makefile.in
@@ -154,8 +154,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
 
 

diff --git a/tests/dircolors/Makefile.in b/tests/dircolors/Makefile.in
index a2e5ac1..0655ab7 100644 (file)
--- a/tests/dircolors/Makefile.in
+++ b/tests/dircolors/Makefile.in
@@ -154,8 +154,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
 
 

diff --git a/tests/du/Makefile.in b/tests/du/Makefile.in
index 728bc87..5540ca1 100644 (file)
--- a/tests/du/Makefile.in
+++ b/tests/du/Makefile.in
@@ -156,7 +156,7 @@ TESTS = \
 
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
-  PATH="`pwd`/../../src@PATH_SEPARATOR@$$PATH"
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
 
 subdir = tests/du
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

diff --git a/tests/expr/Makefile.in b/tests/expr/Makefile.in
index 1ffe2d3..35f0aad 100644 (file)
--- a/tests/expr/Makefile.in
+++ b/tests/expr/Makefile.in
@@ -155,8 +155,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=expr
 
 subdir = tests/expr

diff --git a/tests/factor/Makefile.in b/tests/factor/Makefile.in
index b1be61b..3a64dd0 100644 (file)
--- a/tests/factor/Makefile.in
+++ b/tests/factor/Makefile.in
@@ -155,8 +155,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=factor
 
 subdir = tests/factor

diff --git a/tests/fmt/Makefile.in b/tests/fmt/Makefile.in
index fc0cf25..538fbe0 100644 (file)
--- a/tests/fmt/Makefile.in
+++ b/tests/fmt/Makefile.in
@@ -154,8 +154,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
 
 

diff --git a/tests/head/Makefile.in b/tests/head/Makefile.in
index b7f6cc4..71becdd 100644 (file)
--- a/tests/head/Makefile.in
+++ b/tests/head/Makefile.in
@@ -100,7 +100,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 
-PERL = @PERL@
+PERL = $(PERL)
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
 RANLIB = @RANLIB@

diff --git a/tests/install/Makefile.in b/tests/install/Makefile.in
index bba4bda..a091453 100644 (file)
--- a/tests/install/Makefile.in
+++ b/tests/install/Makefile.in
@@ -153,7 +153,7 @@ 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"
 
 subdir = tests/install
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

diff --git a/tests/join/Makefile.in b/tests/join/Makefile.in
index 5c1f2c6..0aca3ce 100644 (file)
--- a/tests/join/Makefile.in
+++ b/tests/join/Makefile.in
@@ -100,7 +100,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 
-PERL = @PERL@
+PERL = $(PERL)
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
 RANLIB = @RANLIB@

diff --git a/tests/ln/Makefile.in b/tests/ln/Makefile.in
index d1e2935..6d13571 100644 (file)
--- a/tests/ln/Makefile.in
+++ b/tests/ln/Makefile.in
@@ -153,7 +153,7 @@ 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"
 
 subdir = tests/ln
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

diff --git a/tests/ls-2/Makefile.in b/tests/ls-2/Makefile.in
index 1c5a227..0231f1a 100644 (file)
--- a/tests/ls-2/Makefile.in
+++ b/tests/ls-2/Makefile.in
@@ -154,8 +154,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
 
 

diff --git a/tests/ls/Makefile.in b/tests/ls/Makefile.in
index 412525b..84e34b3 100644 (file)
--- a/tests/ls/Makefile.in
+++ b/tests/ls/Makefile.in
@@ -160,7 +160,7 @@ 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
 
 subdir = tests/ls

diff --git a/tests/md5sum/Makefile.in b/tests/md5sum/Makefile.in
index 3daac4d..3bb64e7 100644 (file)
--- a/tests/md5sum/Makefile.in
+++ b/tests/md5sum/Makefile.in
@@ -154,8 +154,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
 
 

diff --git a/tests/misc/Makefile.in b/tests/misc/Makefile.in
index 4fc3fd7..1acb73d 100644 (file)
--- a/tests/misc/Makefile.in
+++ b/tests/misc/Makefile.in
@@ -154,8 +154,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
 
 

diff --git a/tests/mkdir/Makefile.in b/tests/mkdir/Makefile.in
index 942c517..bb9c659 100644 (file)
--- a/tests/mkdir/Makefile.in
+++ b/tests/mkdir/Makefile.in
@@ -154,7 +154,7 @@ 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"
 
 subdir = tests/mkdir
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

diff --git a/tests/mv/Makefile.in b/tests/mv/Makefile.in
index c1eb87c..a948dba 100644 (file)
--- a/tests/mv/Makefile.in
+++ b/tests/mv/Makefile.in
@@ -151,6 +151,7 @@ target_alias = @target_alias@
 AUTOMAKE_OPTIONS = 1.3 gnits
 
 TESTS = \
+  hard-4 \
   hard-3 \
   hard-2 \
   perm-1 \
@@ -165,8 +166,8 @@ 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
 
 subdir = tests/mv

diff --git a/tests/od/Makefile.in b/tests/od/Makefile.in
index a3f8230..275c970 100644 (file)
--- a/tests/od/Makefile.in
+++ b/tests/od/Makefile.in
@@ -154,8 +154,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"
 
 
 TESTS = od-N x8

diff --git a/tests/pr/Makefile.in b/tests/pr/Makefile.in
index 723e129..7b594c2 100644 (file)
--- a/tests/pr/Makefile.in
+++ b/tests/pr/Makefile.in
@@ -100,7 +100,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 
-PERL = @PERL@
+PERL = $(PERL)
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
 RANLIB = @RANLIB@

diff --git a/tests/rm/Makefile.in b/tests/rm/Makefile.in
index 2c1b9ba..3d1c09d 100644 (file)
--- a/tests/rm/Makefile.in
+++ b/tests/rm/Makefile.in
@@ -163,8 +163,8 @@ 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
 
 subdir = tests/rm

diff --git a/tests/rmdir/Makefile.in b/tests/rmdir/Makefile.in
index 2a7be03..fa090f6 100644 (file)
--- a/tests/rmdir/Makefile.in
+++ b/tests/rmdir/Makefile.in
@@ -156,8 +156,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=rmdir
 
 subdir = tests/rmdir

diff --git a/tests/seq/Makefile.in b/tests/seq/Makefile.in
index ebadc88..9222fe7 100644 (file)
--- a/tests/seq/Makefile.in
+++ b/tests/seq/Makefile.in
@@ -155,8 +155,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=seq
 
 subdir = tests/seq

diff --git a/tests/sha1sum/Makefile.in b/tests/sha1sum/Makefile.in
index 4a19e7e..2597a17 100644 (file)
--- a/tests/sha1sum/Makefile.in
+++ b/tests/sha1sum/Makefile.in
@@ -154,8 +154,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
 
 

diff --git a/tests/shred/Makefile.in b/tests/shred/Makefile.in
index 0ce0de0..339fa70 100644 (file)
--- a/tests/shred/Makefile.in
+++ b/tests/shred/Makefile.in
@@ -154,8 +154,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"
 
 
 TESTS = remove exact

diff --git a/tests/sort/Makefile.in b/tests/sort/Makefile.in
index 819ba2d..d836b0a 100644 (file)
--- a/tests/sort/Makefile.in
+++ b/tests/sort/Makefile.in
@@ -100,7 +100,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 
-PERL = @PERL@
+PERL = $(PERL)
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
 RANLIB = @RANLIB@

diff --git a/tests/stty/Makefile.in b/tests/stty/Makefile.in
index d0b405e..5777508 100644 (file)
--- a/tests/stty/Makefile.in
+++ b/tests/stty/Makefile.in
@@ -153,7 +153,7 @@ 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"
 
 subdir = tests/stty
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

diff --git a/tests/sum/Makefile.in b/tests/sum/Makefile.in
index ab6c39f..3068e3e 100644 (file)
--- a/tests/sum/Makefile.in
+++ b/tests/sum/Makefile.in
@@ -154,8 +154,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
 
 

diff --git a/tests/tac/Makefile.in b/tests/tac/Makefile.in
index 50dab93..68b1869 100644 (file)
--- a/tests/tac/Makefile.in
+++ b/tests/tac/Makefile.in
@@ -100,7 +100,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 
-PERL = @PERL@
+PERL = $(PERL)
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
 RANLIB = @RANLIB@

diff --git a/tests/tail-2/Makefile.in b/tests/tail-2/Makefile.in
index 4460936..7d6f4c4 100644 (file)
--- a/tests/tail-2/Makefile.in
+++ b/tests/tail-2/Makefile.in
@@ -154,8 +154,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
 
 

diff --git a/tests/tail/Makefile.in b/tests/tail/Makefile.in
index ef33ee1..cd0df0e 100644 (file)
--- a/tests/tail/Makefile.in
+++ b/tests/tail/Makefile.in
@@ -100,7 +100,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 
-PERL = @PERL@
+PERL = $(PERL)
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
 RANLIB = @RANLIB@

diff --git a/tests/test/Makefile.in b/tests/test/Makefile.in
index 6b7bcdf..b1f54fa 100644 (file)
--- a/tests/test/Makefile.in
+++ b/tests/test/Makefile.in
@@ -100,7 +100,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 
-PERL = @PERL@
+PERL = $(PERL)
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
 RANLIB = @RANLIB@

diff --git a/tests/touch/Makefile.in b/tests/touch/Makefile.in
index 5cf53dd..10050d4 100644 (file)
--- a/tests/touch/Makefile.in
+++ b/tests/touch/Makefile.in
@@ -158,7 +158,7 @@ TESTS = \
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   host_triplet=$(host_triplet) \
-  PATH="`pwd`/../../src@PATH_SEPARATOR@$$PATH"
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
 
 subdir = tests/touch
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

diff --git a/tests/tr/Makefile.in b/tests/tr/Makefile.in
index 2481fe8..0609aa6 100644 (file)
--- a/tests/tr/Makefile.in
+++ b/tests/tr/Makefile.in
@@ -100,7 +100,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 
-PERL = @PERL@
+PERL = $(PERL)
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
 RANLIB = @RANLIB@

diff --git a/tests/tsort/Makefile.in b/tests/tsort/Makefile.in
index 63a4456..f24cddb 100644 (file)
--- a/tests/tsort/Makefile.in
+++ b/tests/tsort/Makefile.in
@@ -154,8 +154,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
 
 

diff --git a/tests/unexpand/Makefile.in b/tests/unexpand/Makefile.in
index e564991..993ddda 100644 (file)
--- a/tests/unexpand/Makefile.in
+++ b/tests/unexpand/Makefile.in
@@ -154,8 +154,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
 
 

diff --git a/tests/uniq/Makefile.in b/tests/uniq/Makefile.in
index 3dfe162..1950b42 100644 (file)
--- a/tests/uniq/Makefile.in
+++ b/tests/uniq/Makefile.in
@@ -100,7 +100,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 
-PERL = @PERL@
+PERL = $(PERL)
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
 RANLIB = @RANLIB@

diff --git a/tests/wc/Makefile.in b/tests/wc/Makefile.in
index d6741d0..9bf24f7 100644 (file)
--- a/tests/wc/Makefile.in
+++ b/tests/wc/Makefile.in
@@ -100,7 +100,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 
-PERL = @PERL@
+PERL = $(PERL)
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
 RANLIB = @RANLIB@