Merge remote-tracking branch 'origin/maint'

[bison.git] / cfg.mk

diff --git a/cfg.mk b/cfg.mk
index 3f244aabee421092b060a23a82199d29e224615c..1aa1c1ab8ef0b68f4fb30e6a496a77720ee724ff 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -37,15 +37,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.
@@ -85,8 +79,8 @@ $(call exclude,                                                               \
   prohibit_defined_have_decl_tests=?|^lib/timevar.c$$                  \
   prohibit_magic_number_exit=^doc/bison.texi$$                         \
   prohibit_magic_number_exit+=?|^tests/(conflicts|regression).at$$     \
+  prohibit_strcmp=^doc/bison\.texi$$                                   \
   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/|doc/bison.texi$$|tests/c\+\+\.at$$)    \
 )