From: Paul Eggert Date: Mon, 5 Jun 2006 20:05:26 +0000 (+0000) Subject: Fix problems when building with Solaris/SVR4/etc. make, which uses a X-Git-Tag: v6.0~325 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ef928100bfa94aa20a24cc858f9811134460060;p=thirdparty%2Fcoreutils.git Fix problems when building with Solaris/SVR4/etc. make, which uses a different and somewhat bogus implementation of VPATH. --- diff --git a/ChangeLog b/ChangeLog index 6bf6384fad..22bb95f8fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,29 @@ -2006-06-03 Jim Meyering +2006-06-05 Paul Eggert * Version 6.0-cvs. + Fix problems when building with Solaris/SVR4/etc. make, which uses a + different and somewhat bogus implementation of VPATH. In the + directory tests/misc, rename tests whose names might appear in the + Automake-generated rules. For example, we can't use a test named + 'test', since Automake generates a rule that contains the text + "if test -f ./$$tst; ...", and this might expand to something like + "if ../../../coreutils-6.0/tests/misc/test -f ./$$test; ...", + which executes the 'test' script rather than the 'test' command. + * tests/misc/false-status: Renamed from tests/misc/false. + * tests/misc/pwd-long: Renamed from tests/misc/pwd. + * tests/misc/sort-merge: Renamed from tests/misc/sort. + ($prog): Set to 'sort' rather than to $PROG. + * tests/misc/test-diag: Renamed from tests/misc/test. + * tests/misc/Makefile.am (PROG): Take the basename of $$tst, + in case Solaris make has prepended the directory. + (TESTS): Adjust to above renamings. + * tests/misc/expand: Don't assign to PROG; no longer needed + now that Makefile.am sets PROG to the basename. + * tests/misc/fold: Likewise. + +2006-06-03 Jim Meyering + Make `cp --link --no-dereference' work also on systems where the link system call cannot create a hard link to a symbolic link. * src/copy.c (copy_internal) [LINK_FOLLOWS_SYMLINKS]: Don't use