From 943bf5a92b5a7a3e4b3a7178654c5491244ee8aa Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 3 Jan 2012 11:35:43 +0100 Subject: [PATCH] maint.mk: remove temporary transition aid from over 1.5 years ago * top/maint.mk (_prohibit_regexp): Remove definition whose sole purpose was to aid in the transition (avoiding silent malfunction) from that old name to the new _sc_search_regexp. This shim was added by commit 219c504b. --- ChangeLog | 6 ++++++ top/maint.mk | 9 --------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5d1709bb6..a105fc8f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2012-01-03 Jim Meyering + maint.mk: remove temporary transition aid from over 1.5 years ago + * top/maint.mk (_prohibit_regexp): Remove definition whose sole + purpose was to aid in the transition (avoiding silent malfunction) + from that old name to the new _sc_search_regexp. This shim was + added by commit 219c504b. + init.sh: do not try to accommodate compare arguments starting with "-" * tests/init.sh (compare_dev_null_): Do not try to accommodate compare arguments that start with "-". Besides, we do not worry diff --git a/top/maint.mk b/top/maint.mk index 27733defc..8a1e6351e 100644 --- a/top/maint.mk +++ b/top/maint.mk @@ -221,15 +221,6 @@ define _sc_say_and_exit { printf '%s\n' "$(ME): $$msg" 1>&2; exit 1; }; endef -# _sc_search_regexp used to be named _prohibit_regexp. However, -# upgrading to the new definition and leaving the old name undefined -# would usually convert each custom rule using $(_prohibit_regexp) -# (usually defined in cfg.mk) into a no-op. This definition ensures -# that people know right away if they're still using the old name. -# FIXME: remove in 2012. -_prohibit_regexp = \ - $(error '*** you need to s/_prohibit_regexp/_sc_search_regexp/, and adapt') - define _sc_search_regexp dummy=; : so we do not need a semicolon before each use; \ \ -- 2.11.0