Hi Eric and Jim. On Sat, 15 Aug 2009, Eric Blake wrote:
> According to Jim Meyering on 8/15/2009 2:37 AM: > >> It changed a bit due to the merge; here's what I'm pushing. > > I haven't pushed yet, in case we decide something different... > > > ... > >> grep -l -w Copyright $$($(VC_LIST_EXCEPT)) \ > >> - | grep -v -E '$(update-copyright-exclude-regexp)' \ > >> + $(srcdir)/ChangeLog | grep -v COPYING \ > >> | $(update-copyright-env) xargs $(build_aux)/$@ Looks like any file whose name contains COPYING is always excluded, and the top-level ChangeLog is always included. Projects cannot override either even when using .x-update-copyright. > About the only > way I can see to include all ChangeLog by default, but still honor the > file .x-update-copyright, is to inline the bulk of the VC_LIST_EXCEPT > macro directly in the update-copyright rule but without the ChangeLog > exception. What about the following patch? >From f72a12d221101f03b43d7be227fcf7550d0ba0d3 Mon Sep 17 00:00:00 2001 From: Joel E. Denny <[email protected]> Date: Mon, 17 Aug 2009 21:41:57 -0400 Subject: [PATCH] maint.mk: give full control over update-copyright exclusions * top/maint.mk (VC_LIST_EXCEPT): Instead of ChangeLog, use ${VC_LIST_EXCEPT_DEFAULT-ChangeLog} as the default exclusion. (update-copyright): Don't force inclusion of top-level ChangeLog. Don't force exclusion of all COPYING files, but make them the default exclusion instead. --- ChangeLog | 9 +++++++++ top/maint.mk | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index da55331..5259d2d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2009-08-17 Joel E. Denny <[email protected]> + + maint.mk: give full control over update-copyright exclusions + * top/maint.mk (VC_LIST_EXCEPT): Instead of ChangeLog, use + ${VC_LIST_EXCEPT_DEFAULT-ChangeLog} as the default exclusion. + (update-copyright): Don't force inclusion of top-level + ChangeLog. Don't force exclusion of all COPYING files, but make + them the default exclusion instead. + 2009-08-16 Bruno Haible <[email protected]> Fix test failures on Solaris 10. diff --git a/top/maint.mk b/top/maint.mk index 3f9c8ff..db41640 100644 --- a/top/maint.mk +++ b/top/maint.mk @@ -38,7 +38,7 @@ VC-tag = git tag -s -m '$(VERSION)' -u '$(gpg_key_ID)' VC_LIST = $(build_aux)/vc-list-files -C $(srcdir) VC_LIST_EXCEPT = \ - $(VC_LIST) | if test -f $(srcdir)/.x-$@; then grep -vEf $(srcdir)/.x-$@; else grep -v ChangeLog; fi + $(VC_LIST) | if test -f $(srcdir)/.x-$@; then grep -vEf $(srcdir)/.x-$@; else grep -v $${VC_LIST_EXCEPT_DEFAULT-ChangeLog}; fi ifeq ($(origin prev_version_file), undefined) prev_version_file = $(srcdir)/.prev-version @@ -785,6 +785,6 @@ update-copyright-env ?= # in the file .x-update-copyright. .PHONY: update-copyright update-copyright: - grep -l -w Copyright $$($(VC_LIST_EXCEPT)) \ - $(srcdir)/ChangeLog | grep -v COPYING \ + grep -l -w Copyright \ + $$(export VC_LIST_EXCEPT_DEFAULT=COPYING && $(VC_LIST_EXCEPT)) \ | $(update-copyright-env) xargs $(build_aux)/$@ -- 1.5.4.3
