Some minor issues with 5.96

[Ralf Wildenhues]

- Solaris 2.6 doesn't grok these lines:
  | base64.1:   $(common_dep)   $(srcdir)/base64.x      ../src/base64.c

  in that ../src/base64.c isn't searched through VPATH.  Using GNU make
  works.  Solaris 7 has this fixed.

- Let's have `make check' be portable, so users can easily use it.
  Patch below.

- On Solaris 7, I get one test failure:
  (Is that due to a recent Autoconf glitch?)
  | FAIL: ../../../coreutils-5.96/tests/cp/symlink-slash

  Verbose output at the end of this message.

Cheers,
Ralf

        * doc/Makefile.am: Use `$(EGREP)' instead of `grep -E'.

Index: doc/Makefile.am
===================================================================
RCS file: /sources/coreutils/coreutils/doc/Makefile.am,v
retrieving revision 1.36
diff -u -r1.36 Makefile.am
--- doc/Makefile.am     19 Jun 2005 13:43:50 -0000      1.36
+++ doc/Makefile.am     27 May 2006 12:44:09 -0000
@@ -40,14 +40,14 @@
        $(EGREP) '$(_W)NUL$(W_)' $(srcdir)/*.texi && fail=1; \
        grep '\$$@"' $(srcdir)/*.texi && fail=1; \
        grep -n '[^[:punct:address@hidden' $(srcdir)/*.texi && fail=1; \
-       grep -n filename $(srcdir)/*.texi|grep -vE 'setfilename|{filename}' \
+       grep -n filename $(srcdir)/*.texi|$(EGREP) -v 'setfilename|{filename}' \
          && fail=1; \
        $(PERL) -e 1 2> /dev/null && { $(PERL) -ne \
          '/\bPOSIX\b/ && !/address@hidden/ && !/^\* / || /{posix}/ and 
print,exit 1' \
          $(srcdir)/*.texi 2> /dev/null || fail=1; }; \
-       grep -iwE 'builtins?' $(srcdir)/*.texi && fail=1; \
-       grep -iwE 'path(name)?s?' $(srcdir)/*.texi \
-         | grep -vE '@vindex PATH$$|@env{PATH}' && fail=1; \
+       $(EGREP) -iw 'builtins?' $(srcdir)/*.texi && fail=1; \
+       $(EGREP) -iw 'path(name)?s?' $(srcdir)/*.texi \
+         | $(EGREP) -v '@vindex PATH$$|@env{PATH}' && fail=1; \
        exit $$fail
 
 check: check-texinfo


VERBOSE=yes TESTS=symlink-slash make -e check
make  check-TESTS
+ cp --version
cp (GNU coreutils) 5.96
Copyright (C) 2006 Free Software Foundation, Inc.
This is free software.  You may redistribute copies of it under the terms of
the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
There is NO WARRANTY, to the extent permitted by law.

Written by Torbjorn Granlund, David MacKenzie, and Jim Meyering.
+ . ../../../coreutils-5.96/tests/cp/../envvar-check
as_unset=unset
envvar_check_failed=0
vars=
  BLOCKSIZE
  BLOCK_SIZE
  DF_BLOCK_SIZE
  DU_BLOCK_SIZE
  LS_BLOCK_SIZE
  SIMPLE_BACKUP_SUFFIX
  VERSION_CONTROL

+ unset BLOCKSIZE
+ eval test "${BLOCKSIZE+set}" = set
+ test  = set
+ unset BLOCK_SIZE
+ eval test "${BLOCK_SIZE+set}" = set
+ test  = set
+ unset DF_BLOCK_SIZE
+ eval test "${DF_BLOCK_SIZE+set}" = set
+ test  = set
+ unset DU_BLOCK_SIZE
+ eval test "${DU_BLOCK_SIZE+set}" = set
+ test  = set
+ unset LS_BLOCK_SIZE
+ eval test "${LS_BLOCK_SIZE+set}" = set
+ test  = set
+ unset SIMPLE_BACKUP_SUFFIX
+ eval test "${SIMPLE_BACKUP_SUFFIX+set}" = set
+ test  = set
+ unset VERSION_CONTROL
+ eval test "${VERSION_CONTROL+set}" = set
+ test  = set
+ test  = 1
+ . ../../../coreutils-5.96/tests/cp/../lang-default
+ eval LANG=; export LANG
LANG=
+ export LANG
+ eval LANGUAGE=; export LANGUAGE
LANGUAGE=
+ export LANGUAGE
+ eval LC_ALL=; export LC_ALL
LC_ALL=
+ export LC_ALL
+ eval LC_COLLATE=; export LC_COLLATE
LC_COLLATE=
+ export LC_COLLATE
+ eval LC_CTYPE=; export LC_CTYPE
LC_CTYPE=
+ export LC_CTYPE
+ eval LC_MESSAGES=; export LC_MESSAGES
LC_MESSAGES=
+ export LC_MESSAGES
+ eval LC_NUMERIC=; export LC_NUMERIC
LC_NUMERIC=
+ export LC_NUMERIC
+ eval LC_TIME=; export LC_TIME
LC_TIME=
+ export LC_TIME
+ pwd
pwd=/home/rwild/coreutils/build-sparc-sun-solaris2.7/tests/cp
+ echo ../../../coreutils-5.96/tests/cp/symlink-slash
+ sed s,.*/,,
t0=symlink-slash.tmp
tmp=symlink-slash.tmp/4597
+ trap status=$?; cd $pwd; rm -rf $t0 && exit $status 0
+ trap (exit $?); exit 1 2 13 15
framework_failure=0
+ mkdir -p symlink-slash.tmp/4597
+ cd symlink-slash.tmp/4597
+ mkdir dir
+ ln -s dir symlink
+ test 0 = 1
fail=0
+ cp -dR symlink/ s
+ ls -l s
+ set lrwxrwxrwx 1 rwild rwild 3 May 27 07:46 s -> dir
+ test lrwxrwxrwx 1 rwild rwild 3 May 27 07:46 s -> dir = total 0
fail=1
+ exit 1
+ exit 1
status=1
+ cd /home/rwild/coreutils/build-sparc-sun-solaris2.7/tests/cp
+ rm -rf symlink-slash.tmp
+ exit 1
FAIL: symlink-slash