Merge branch 'master' into ng/master

* master:
  maint: typofixes in makefile comments
  maint: remove extra verbosity from a maintainer rule
  NEWS: fix grammaro
  maint: version bump after beta release
  release: beta release 1.12b (will become 1.13)
  cosmetics: comments fixlets in our Makefile
  cosmetics: consistency changes in some make recipes
  tests: avoid a spurious failure on NetBSD
  tests: re-enable some checks disabled by mistake ...
  tests: avoid a "grep -E" portability issue
  tests: avoid a spurious failure due to a Clang bug
  NEWS: start preparing for the 1.13 release
  tests: typofix in the shebang line of 't/py-compile-destdir.sh'
  HACKING: release process: fixlets about the announcement
  maint: post-release minor version bump
  release: stable release 1.12.5
  tests: avoid errors due to underquoted third-party macros
  maintcheck: also consider contrib tests for syntax checks
  cosmetics: whitespace fixlets in syntax-checks.mk

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --cc HACKING
Simple merge

diff --cc Makefile.am
index 8c9fa178c68cad03671ce4406a4ecbd2ab0624a0,6a4ebd45b7e9887722a5c4bf0d3eeb06f35703ac..0373386884e7e03db0bebf9ebf22a55e030e396a
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -62,13 -71,11 +62,13 @@@ EXTRA_DIST += 
    GNUmakefile \
    maint.mk \
    syntax-checks.mk \
 -  HACKING
 +  HACKING \
 +  NG-NEWS \
 +  $(gitlog_to_changelog_fixes)
  
- ## Make versioned links.  We only run the transform on the root name;
- ## then we make a versioned link with the transformed base name.  This
- ## seemed like the most reasonable approach.
+ # Make versioned links.  We only run the transform on the root name;
+ # then we make a versioned link with the transformed base name.  This
+ # seemed like the most reasonable approach.
  install-exec-hook:
        @$(POST_INSTALL)
        @for p in $(bin_SCRIPTS); do \
@@@ -86,11 -93,13 +86,11 @@@ uninstall-hook
          rm -f "$(DESTDIR)$(bindir)/$$fv"; \
        done
  
- ## These files depend on Makefile so they are rebuilt if $(VERSION),
- ## $(datadir) or other do_subst'ituted variables change.
+ # These files depend on Makefile so they are rebuilt if $(VERSION),
+ # $(datadir) or other do_subst'ituted variables change.
 -automake: automake.in
 -aclocal: aclocal.in
 -automake aclocal: Makefile
 +automake aclocal: %: %.in Makefile
        $(AM_V_at)rm -f $@ $@-t
 -      $(AM_V_GEN)in=$@.in; $(do_subst) <$(srcdir)/$@.in >$@-t
 +      $(AM_V_GEN)$(do_subst)
  ## We can't use '$(generated_file_finalize)' here, because currently
  ## Automake contains occurrences of unexpanded @substitutions@ in
  ## comments, and that is perfectly legit.
@@@ -395,17 -368,39 +395,17 @@@ AM_TESTS_ENVIRONMENT += 
    PATH='$(abs_builddir)/t/ax'$(PATH_SEPARATOR)$$PATH; \
    export PATH;
  
 -# Hand-written tests.
 -
 -include $(srcdir)/t/list-of-tests.mk
 -
 -TESTS += $(handwritten_TESTS)
 -EXTRA_DIST += $(handwritten_TESTS)
 -
 -# Automatically-generated tests wrapping hand-written ones.
 -# Also, automatically-computed dependencies for tests.
 -
 -include $(srcdir)/t/testsuite-part.am
 -
 -TESTS += $(generated_TESTS)
 -EXTRA_DIST += $(generated_TESTS)
 +# Automatically-computed dependencies for tests.
 +include $(srcdir)/testsuite-autodeps.am
  
- ## The dependencies declared here are not truly complete, but such
- ## completeness would cause more issues than it would solve.  See
- ## automake bug#11347.
 -$(srcdir)/t/testsuite-part.am:
 -      $(AM_V_at)rm -f t/testsuite-part.tmp $@
 -      $(AM_V_GEN)$(PERL) $(srcdir)/gen-testsuite-part \
 -        --srcdir $(srcdir) > t/testsuite-part.tmp
 -      $(AM_V_at)chmod a-w t/testsuite-part.tmp
 -      $(AM_V_at)mv -f t/testsuite-part.tmp $@
 -EXTRA_DIST += gen-testsuite-part
 -
 -# The dependecies declared here are not truly complete, but such
++# The dependencies declared here are not truly complete, but such
+ # completeness would cause more issues than it would solve.  See
+ # automake bug#11347.
 -$(generated_TESTS): $(srcdir)/gen-testsuite-part
 -$(srcdir)/t/testsuite-part.am: $(srcdir)/gen-testsuite-part Makefile.am
 -
 -# Hand-written tests for stuff in 'contrib/'.
 -include $(srcdir)/contrib/t/local.am
 -TESTS += $(contrib_TESTS)
 -EXTRA_DIST += $(contrib_TESTS)
 +$(srcdir)/testsuite-autodeps.am: $(srcdir)/gen-testsuite-part
 +      $(AM_V_at)rm -f $(@F)-t $@
 +      $(AM_V_GEN)$(PERL) $< --srcdir $(srcdir) > $(@F)-t
 +      $(AM_V_at)chmod a-w $(@F)-t && mv -f $(@F)-t $@
 +EXTRA_DIST += gen-testsuite-part
  
  # Static dependencies valid for each test case (also further
  # extended later).  Note that use 'noinst_' rather than 'check_'

diff --cc configure.ac
index 24976c9bb946c679c26eeb66f1f5d4ee013ea539,b17520c214b908aa134b8f8ff50be91ea985e111..a9d26e55acf59d9508788c2996c8a703e5553127
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -16,7 -16,7 +16,7 @@@
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
  AC_PREREQ([2.69])
- AC_INIT([GNU Automake-NG], [1.12a], [automake-ng@gnu.org])
 -AC_INIT([GNU Automake], [1.12c], [bug-automake@gnu.org])
++AC_INIT([GNU Automake-NG], [1.12c], [automake-ng@gnu.org])
  
  AC_CONFIG_SRCDIR([automake.in])
  AC_CONFIG_AUX_DIR([lib])

diff --cc maint.mk
Simple merge

diff --cc syntax-checks.mk
Simple merge

diff --cc t/tags-pr12372.sh
Simple merge