Merge remote-tracking branch 'origin/maint'

[bison.git] / cfg.mk

diff --git a/cfg.mk b/cfg.mk
index 31a2532f8ee06a094b041b216ca4d7d252ad7c11..392d2112bebbbff8e4df7dde320cc862dfd52708 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -36,15 +36,9 @@ url_dir_list = \
   ftp://$(gnu_rel_host)/gnu/bison
 
 # Tests not to run as part of "make distcheck".
-# Exclude changelog-check here so that there's less churn in ChangeLog
-# files -- otherwise, you'd need to have the upcoming version number
-# at the top of the file for each `make distcheck' run.
-local-checks-to-skip = \
-  changelog-check \
+local-checks-to-skip =                 \
   sc_immutable_NEWS                    \
-  sc_prohibit_always_true_header_tests \
-  sc_prohibit_atoi_atof                        \
-  sc_prohibit_strcmp
+  sc_prohibit_atoi_atof
 
 # The local directory containing the checked-out copy of gnulib used in
 # this release.  Used solely to get a date for the "announcement" target.
@@ -68,9 +62,9 @@ $(call exclude,                                                               \
   prohibit_always-defined_macros+=?|^lib/timevar.c$$                   \
   prohibit_always-defined_macros+=?|^src/(parse-gram.c|system.h)$$     \
   prohibit_always-defined_macros+=?|^tests/regression.at$$             \
-  prohibit_empty_lines_at_EOF=^src/parse-gram.[ch]$$                   \
+  prohibit_empty_lines_at_EOF=^src/parse-gram.h$$                      \
+  prohibit_strcmp=^doc/bison\.texinfo$$                                        \
   require_config_h_first=^(lib/yyerror|data/(glr|yacc))\.c$$           \
   space_tab=^tests/(input|c\+\+)\.at$$                                 \
-  trailing_blank=^src/parse-gram.[ch]$$                                        \
   unmarked_diagnostics=^djgpp/                                         \
 )