summaryrefslogtreecommitdiff
path: root/top
diff options
context:
space:
mode:
authorEric Blake <eblake@redhat.com>2010-04-02 08:47:05 -0600
committerEric Blake <eblake@redhat.com>2010-04-02 08:47:40 -0600
commitd2d54527de432a0ae290c75286d62843ac0c68e0 (patch)
treea5e2a4268352dbcc3ecbfeb7b5007f24133e5365 /top
parent463a2f81e2b9497150f0291c822c37b212cbe997 (diff)
downloadgnulib-d2d54527de432a0ae290c75286d62843ac0c68e0.tar.gz
maint.mk: fix some fallout
Also rearrange ChangeLog to match commit order. * NEWS: Document the incompatible change, and its effect on cfg.mk. * top/maint.mk (sc_prohibit_test_minus_ao): Update. Signed-off-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'top')
-rw-r--r--top/maint.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/top/maint.mk b/top/maint.mk
index 9cfe1726ce..13a0438f90 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -670,9 +670,9 @@ _ptm2 = use "test C1 || test C2", not "test C1 -''o C2"
# 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.