From: Joel E. Denny <jdenny@clemson.edu>
Date: Tue, 18 Aug 2009 01:41:57 +0000 (-0400)
Subject: maint.mk: give full control over update-copyright exclusions
X-Git-Tag: v0.1~5640
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=3ef64012bf653379fda629f5a6b619be4c1f2e69;p=gnulib.git

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 da55331b2..5259d2d27 100644
--- 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 3f9c8ff7e..410817767 100644
--- 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)/$@