Mercurial > gnulib

changeset 11847:5dd8e8cf05db

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Joel E. Denny <jdenny@clemson.edu>
date Mon, 17 Aug 2009 21:41:57 -0400
parents 8c0ae46110c9
children 9e3299dad578
files ChangeLog top/maint.mk
diffstat 2 files changed, 13 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Aug 17 06:51:21 2009 -0700
+++ b/ChangeLog	Mon Aug 17 21:41:57 2009 -0400
@@ -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.
--- a/top/maint.mk	Mon Aug 17 06:51:21 2009 -0700
+++ b/top/maint.mk	Mon Aug 17 21:41:57 2009 -0400
@@ -38,7 +38,8 @@
 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 @@
 # 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)/$@