Change %merge result type clash warnings to errors. Discussed at

[bison.git] / Makefile.cfg

diff --git a/Makefile.cfg b/Makefile.cfg
index 0d72c3eb79915fb3417b0608e8a786daff1ea93e..fb15523168986028f749acd34b5e69aae89e93dd 100644 (file)
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -1,5 +1,5 @@
 # Customize Makefile.maint for Bison.            -*- makefile -*-
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005, 2006 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,8 +16,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA.
 
-prev_version_file = $(srcdir)/config/prev-version.txt
-announce_gen   = $(srcdir)/config/announce-gen
+build_aux_dir = $(srcdir)/build-aux
+prev_version_file = $(build_aux_dir)/prev-version.txt
+announce_gen   = $(build_aux_dir)/announce-gen
 release_archive_dir = releases
 
 # Use alpha.gnu.org for alpha and beta releases.
@@ -32,18 +33,16 @@ url_dir_list = \
 
 # Files to update automatically.
 wget_files = \
-  $(srcdir)/config/config.guess \
-  $(srcdir)/config/config.sub \
-  $(srcdir)/config/texinfo.tex \
+  $(build_aux_dir)/config.guess \
+  $(build_aux_dir)/config.sub \
+  $(build_aux_dir)/texinfo.tex \
 
 cvs_files = \
-  $(srcdir)/config/install-sh \
-  $(srcdir)/config/mdate-sh \
-  $(srcdir)/config/missing \
-  $(srcdir)/config/mkinstalldirs
+  $(build_aux_dir)/install-sh \
+  $(build_aux_dir)/mdate-sh \
+  $(build_aux_dir)/missing \
+  $(build_aux_dir)/mkinstalldirs
 
 # Tests not to run.
-# local-checks-to-skip ?= \
-#   author_mark_check \
-#   strftime-check syntax-check makefile_path_separator_check \
-#   makefile-check
+local-checks-to-skip = \
+  changelog-check