Merge branch 'master' of /cu

2 files changed, 5 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index a89a0165e..413a234f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,6 +39,9 @@
 
 2007-01-04  Jim Meyering  <jim@meyering.net>
 
+	* Makefile.cfg (local-checks-to-skip): Skip strftime-check, in
+	case you don't have convenient access to glibc info documentation.
+
 	Use the release year, not the current year.
 	* src/groups.sh (version): Use a better name: @RELEASE_YEAR@.
 	* src/Makefile.am (RELEASE_YEAR): Define it.
diff --git a/Makefile.cfg b/Makefile.cfg
index bd42ca036..4ade0bddb 100644
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -1,5 +1,5 @@
 # Customize Makefile.maint.                           -*- makefile -*-
-# Copyright (C) 2003-2006 Free Software Foundation, Inc.
+# Copyright (C) 2003-2007 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@ gpg_key_ID = D333CBA1
 # Exclude changelog-check here so that there's less churn in ChangeLog
 # files -- otherwise, you'd need to have the upcoming version number
 # at the top of the file for each `make distcheck' run.
-local-checks-to-skip = changelog-check
+local-checks-to-skip = changelog-check strftime-check
 
 # The local directory containing the checked-out copy of gnulib used in
 # this release.  Used solely to get a date for the "announcement" target.