--- a/ChangeLog	Mon Mar 29 15:38:39 2010 +0200
+++ b/ChangeLog	Fri Apr 02 08:47:05 2010 -0600
@@ -1,18 +1,8 @@
-2010-03-31  Eric Blake  <eblake@redhat.com>
-
-	maint.mk: check for [ as well as test
-	* top/maint.mk (sc_prohibit_test_minus_ao): Extend test.
-	Based on a libvirt report by Matthias Bolte.
-
-	gnumakefile: don't squelch _version output
-	* top/GNUmakefile (_version): Create one-shot dependency rather
-	than using $(shell) when version must be regenerated.
-	(_autoreconf): Run verbosely, by default.
-
-	sys_time: avoid compiler warnings
-	* lib/sys_time.in.h (includes): Ensure gcc pragma is
-	unconditional, fixing regression from 2010-03-29.
-	Reported by Simon Josefsson.
+2010-04-02  Eric Blake  <eblake@redhat.com>
+
+	maint.mk: fix some fallout
+	* NEWS: Document the incompatible change, and its effect on cfg.mk.
+	* top/maint.mk (sc_prohibit_test_minus_ao): Update.
 
 2010-03-28  Jose E. Marchesi  <jemarch@gnu.org>
 
@@ -58,6 +48,24 @@
 	(sc_error_message_uppercase): Likewise.
 	(sc_error_message_period): Likewise.
 
+2010-03-31  Eric Blake  <eblake@redhat.com>
+
+	maint.mk: check for [ as well as test
+	* top/maint.mk (sc_prohibit_test_minus_ao): Extend test.
+	Based on a libvirt report by Matthias Bolte.
+
+	gnumakefile: don't squelch _version output
+	* top/GNUmakefile (_version): Create one-shot dependency rather
+	than using $(shell) when version must be regenerated.
+	(_autoreconf): Run verbosely, by default.
+
+	sys_time: avoid compiler warnings
+	* lib/sys_time.in.h (includes): Ensure gcc pragma is
+	unconditional, fixing regression from 2010-03-29.
+	Reported by Simon Josefsson.
+
+2010-03-28  Jose E. Marchesi  <jemarch@gnu.org>
+
 	maint.mk: s/_header_without_use/_sc_header_without_use/
 	* top/maint.mk (_sc_header_without_use): Rename from _header_without_use.
 	(sc_prohibit_assert_without_use): Use the new name.

--- a/NEWS	Mon Mar 29 15:38:39 2010 +0200
+++ b/NEWS	Fri Apr 02 08:47:05 2010 -0600
@@ -6,6 +6,11 @@
 
 Date        Modules         Changes
 
+2010-04-02  maintainer-makefile
+                            The macro _prohibit_regexp has been revamped into
+                            a new macro _sc_search_regexp; custom syntax
+                            checks in your cfg.mk will need to be rewritten.
+
 2010-03-28  lib-ignore      This module now provides a variable
                             IGNORE_UNUSED_LIBRARIES_CFLAGS that you should
                             add to LDFLAGS (when linking C programs only) or

--- a/top/maint.mk	Mon Mar 29 15:38:39 2010 +0200
+++ b/top/maint.mk	Fri Apr 02 08:47:05 2010 -0600
@@ -670,9 +670,9 @@
 # Using test's -a and -o operators is not portable.
 # We prefer test over [, since the latter is spelled [[ in configure.ac.
 sc_prohibit_test_minus_ao:
-	@re='(\<test| \[+) .+ -[ao] '					\
-	msg='$(_ptm1); $(_ptm2)'					\
-	  $(_prohibit_regexp)
+	@prohibit='(\<test| \[+) .+ -[ao] '				\
+	halt='$(_ptm1); $(_ptm2)'					\
+	  $(_sc_search_regexp)
 
 # Each program that uses proper_name_utf8 must link with one of the
 # ICONV libraries.  Otherwise, some ICONV library must appear in LDADD.