-SUBDIRS = config intl po lib src doc m4 tests
-
-EXTRA_DIST = REFERENCES configure.bat OChangeLog Makefile.maint GNUmakefile
-
-DISTCLEANFILES = intl/libintl.h
-
-
-## ---------------------------- ##
-## Customizing Makefile.maint. ##
-## ---------------------------- ##
-
-move_if_change = $(srcdir)/config/move-if-change
-prev_version_file = $(srcdir)/config/prev-version.txt
-release_archive_dir = releases
-
-# Uploading betas.
-hosts = alpha
-alpha_host = alpha.gnu.org
-alpha_url_dir = gnu/bison
-
-# Files to update automatically.
-wget_files = $(srcdir)/config/config.guess $(srcdir)/config/config.sub \
- $(srcdir)/config/texinfo.tex
+SUBDIRS = build-aux po runtime-po lib data src doc examples tests etc
+
+# Files installed for use by Automake.
+aclocaldir = @aclocaldir@
+aclocal_DATA = m4/bison-i18n.m4
+
+EXTRA_DIST = .prev-version .version cfg.mk maint.mk \
+ OChangeLog PACKAGING \
+ djgpp/Makefile.maint djgpp/README.in djgpp/config.bat \
+ djgpp/config.sed djgpp/config.site djgpp/config_h.sed \
+ djgpp/subpipe.c djgpp/subpipe.h djgpp/djunpack.bat \
+ djgpp/fnchange.lst djgpp/testsuite.sed
+
+
+.PHONY: maintainer-check
+maintainer-check:
+ cd tests && $(MAKE) $(AM_MAKEFLAGS) $@
+
+.PHONY: maintainer-push-check
+maintainer-push-check:
+ cd tests && $(MAKE) $(AM_MAKEFLAGS) $@
+
+.PHONY: maintainer-xml-check
+maintainer-xml-check:
+ cd tests && $(MAKE) $(AM_MAKEFLAGS) $@
+
+# See comments in build-aux/git-version-gen. However, we make .version depend
+# on configure so that .version and VERSION/PACKAGE_VERSION stay in sync in the
+# working copy (for example, when you run autoreconf && make). Allowing these
+# to fall out of sync appears to have little potential to improve Bison build
+# efficiency (even if we were to replace VERSION/PACKAGE_VERSION with .version
+# everywhere possible). On the other hand, it could be harmful. For example,
+# a developer might naively reference .version in a test case while the bison
+# executable still compiles with VERSION, and so the test case might fail or
+# pass incorrectly.
+BUILT_SOURCES = $(top_srcdir)/.version
+$(top_srcdir)/.version: configure
+ echo $(VERSION) > $@-t && mv $@-t $@
+dist-hook:
+ echo $(VERSION) > $(distdir)/.tarball-version