maint.mk: allow packages to add makefile @@ exceptions

Rather than hard-coding a coreutils-specific exception, this
allows a package to specify its own exceptions in cfg.mk.

* top/maint.mk (_makefile_at_at_check_exceptions): New hook.
(sc_makefile_check): Rename...
(sc_makefile_at_at_check): ...to this, and use hook.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index dc7776eab2f4ace657181a2c488df3fc9f29cc3c..b1d9a6a79882c24508de76f1be0230ec4bb7def6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-01-08  Eric Blake  <ebb9@byu.net>
 
+       maint.mk: allow packages to add makefile @@ exceptions
+       * top/maint.mk (_makefile_at_at_check_exceptions): New hook.
+       (sc_makefile_check): Rename...
+       (sc_makefile_at_at_check): ...to this, and use hook.
+
        dup2: work around mingw bug
        * lib/dup2.c (rpl_dup2): Sanitize return value on mingw.
        Reported by Simon Josefsson.

diff --git a/top/maint.mk b/top/maint.mk
index d1f0ccd0732f3fcf329eda7575c618e0272ad57d..3cd1a93bf0db6987a6fb23799c15756e065e697a 100644 (file)
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -580,8 +580,12 @@ update-NEWS-hash: NEWS
 # to emit a definition for each substituted variable.
 # We use perl rather than "grep -nE ..." to exempt a single
 # use of an @...@-delimited variable name in src/Makefile.am.
-sc_makefile_check:
-       @perl -ne '/\@[A-Z_0-9]+\@/ && !/^cu_install_program =/'        \
+# Allow the package to add exceptions via a hook in cfg.mk;
+# for example, @PRAGMA_SYSTEM_HEADER@ can be permitted by
+# setting this to ' && !/PRAGMA_SYSTEM_HEADER/'.
+_makefile_at_at_check_exceptions ?=
+sc_makefile_at_at_check:
+       @perl -ne '/\@[A-Z_0-9]+\@/'$(_makefile_at_at_check_exceptions) \
          -e 'and (print "$$ARGV:$$.: $$_"), $$m=1; END {exit !$$m}'    \
            $$($(VC_LIST_EXCEPT) | grep -E '(^|/)Makefile\.am$$')       \
          && { echo '$(ME): use $$(...), not @...@' 1>&2; exit 1; } || :