X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=top%2Fmaint.mk;h=ee721de30325afc35ed28c7cf6d7657a89468fc5;hb=c0a84055967844d0f49f124b02cfd65d13f154db;hp=be7ba490ea32e43734f73018b3b67c8b07b9f3c5;hpb=bfb5863e350590d8fe9a643d840c7d0b5f3d934b;p=gnulib.git

diff --git a/top/maint.mk b/top/maint.mk
index be7ba490e..ee721de30 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -303,11 +303,12 @@ sc_prohibit_atoi_atof:
 	  $(_sc_search_regexp)
 
 # Use STREQ rather than comparing strcmp == 0, or != 0.
+sp_ = strcmp *\(.+\)
 sc_prohibit_strcmp:
-	@grep -nE '! *str''cmp *\(|\<str''cmp *\(.+\) *[!=]='	\
+	@grep -nE '! *strcmp *\(|\<$(sp_) *[!=]=|[!=]= *$(sp_)'		\
 	    $$($(VC_LIST_EXCEPT))					\
 	  | grep -vE ':# *define STRN?EQ\(' &&				\
-	  { echo '$(ME): replace str''cmp calls above with STREQ/STRNEQ' \
+	  { echo '$(ME): replace strcmp calls above with STREQ/STRNEQ'	\
 		1>&2; exit 1; } || :
 
 # Pass EXIT_*, not number, to usage, exit, and error (when exiting)
@@ -1015,8 +1016,8 @@ update-NEWS-hash: NEWS
 # setting this to ' && !/PRAGMA_SYSTEM_HEADER/'.
 _makefile_at_at_check_exceptions ?=
 sc_makefile_at_at_check:
-	@perl -ne '/\@[A-Z_0-9]+\@/'					\
-          -e ' && !/([A-Z_0-9]+)\s+=.*\@\1\@$$/'			\
+	@perl -ne '/\@\w+\@/'						\
+          -e ' && !/(\w+)\s+=.*\@\1\@$$/'				\
           -e ''$(_makefile_at_at_check_exceptions)			\
 	  -e 'and (print "$$ARGV:$$.: $$_"), $$m=1; END {exit !$$m}'	\
 	    $$($(VC_LIST_EXCEPT) | grep -E '(^|/)(Makefile\.am|[^/]+\.mk)$$') \