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.

diff --git a/ChangeLog b/ChangeLog
index da55331b24855e3c81bc1ea64635cd99dfa5c80f..5259d2d277b2d55f45a0854fe29acde6a9518892 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-08-17  Joel E. Denny  <jdenny@clemson.edu>
+
+       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  <bruno@clisp.org>
 
        Fix test failures on Solaris 10.

diff --git a/top/maint.mk b/top/maint.mk
index 3f9c8ff7e8eb72891ebb31d8c2607cde8c504095..4108177678384acb7c515ede36e5d8c2939c950b 100644 (file)
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -38,7 +38,8 @@ 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 -Ev "$${VC_LIST_EXCEPT_DEFAULT-ChangeLog}"; fi
 
 ifeq ($(origin prev_version_file), undefined)
   prev_version_file = $(srcdir)/.prev-version
@@ -785,6 +786,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)/$@