[PATCH] maint.mk: avoid obscure sc_copyright_check failure in coreutils

[Jim Meyering]

Today I saw "make syntax-check" fail like this:

    $ make sc_copyright_check
    copyright_check
    grep: b/coreutils-8.5.147-cd8831/lib/version-etc.c: No such file or 
directory
    ./tests/torture/taint/a
    maint.mk: out of date copyright in lib/version-etc.c; update it
    make: *** [sc_copyright_check] Error 1

The sc_copyright_check does this:

        @require='enum { COPYRIGHT_YEAR = '$$(date +%Y)' };'            \
        in_files=$(v_etc_file)                                          \
        halt='out of date copyright in $(v_etc_file); update it'        \
          $(_sc_search_regexp)

and due to a prior "make distcheck" failure
(just fixed in gnulib), I had a left-over tests/torture/
hierarchy containing the culprit:

$ find|grep 'b/core.*version-etc.c'
./tests/torture/taint/a 
b/coreutils-8.5.147-cd8831/gnulib-tests/test-version-etc.c
./tests/torture/taint/a b/coreutils-8.5.147-cd8831/lib/version-etc.c

I've fixed it like this:

>From 583c47de09e3fb912baa00ddd405ab66fdad433c Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyer...@redhat.com>
Date: Sat, 4 Sep 2010 18:16:04 +0200
Subject: [PATCH] maint.mk: avoid obscure sc_copyright_check failure in coreutils

* top/maint.mk (v_etc_file): Prepend $(gnulib_dir)/, to avoid
false positives (whose names may be ill-chosen) when searching
non-VC'd files.  Otherwise, a file named "a b/lib/version-etc.c"
would cause a false-positive.
---
 ChangeLog    |    6 ++++++
 top/maint.mk |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 47e82e4..1ba0d92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-09-04  Jim Meyering  <meyer...@redhat.com>

+       maint.mk: avoid obscure sc_copyright_check failure in coreutils
+       * top/maint.mk (v_etc_file): Prepend $(gnulib_dir)/, to avoid
+       false positives (whose names may be ill-chosen) when searching
+       non-VC'd files.  Otherwise, a file named "a b/lib/version-etc.c"
+       would cause a false-positive.
+
        avoid coreutils "make distcheck" failure
        Coreutils tests with an absolute build directory name that contains
        a space.  Not quoting this directory name caused a failure.
diff --git a/top/maint.mk b/top/maint.mk
index 59e9cb5..32320f8 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -954,7 +954,7 @@ writable-files:
          test "$$fail" && exit 1 || : ;                                \
        fi

-v_etc_file = lib/version-etc.c
+v_etc_file = $(gnulib_dir)/lib/version-etc.c
 sample-test = tests/sample-test
 texi = doc/$(PACKAGE).texi
 # Make sure that the copyright date in $(v_etc_file) is up to date.
--
1.7.2.2.566.g36af9