Merge branch 'maint'

* maint:
  sync: auxiliary files from upstream synced
  sync: fix syncing of 'gitlog-to-changelog' script
  maintcheck: avoid false positive in sc_tests_plain_make

diff --cc Makefile.am
index 77d76eb,8fe9c0f..208ea2d
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -497,34 -399,9 +497,34 @@@ sc_tests_make_without_am_makeflags
          exit 1; \
        fi
  
 +## Look out for some obsolete variables.
 +sc_tests_obsolete_variables:
 +      @vars=" \
 +        using_tap \
 +        parallel_tests \
 +        test_prefer_config_shell \
 +        original_AUTOMAKE \
 +        original_ACLOCAL \
 +      "; \
 +      seen=""; \
 +      for v in $$vars; do \
 +        if grep -E "\b$$v\b" \
 +          $(xtests) $(srcdir)/tests/defs \
 +          $(srcdir)/tests/defs-static.in \
 +        ; then \
 +          seen="$$seen $$v"; \
 +        fi; \
 +      done; \
 +      if test -n "$$seen"; then \
 +        for v in $$seen; do \
 +          echo "Variable '$$v' is obsolete, use 'am_$$v' instead." 1>&2; \
 +        done; \
 +        exit 1; \
 +      else :; fi
 +
  ## Tests should never call make directly.
  sc_tests_plain_make:
-       @if grep -v '^#' $(xtests) | $(EGREP) ':[       ]*make( |$$)'; then \
 -      @if grep -v '^#' $(srcdir)/tests/*.test | $(EGREP) ':[  ]*make( |$$)'; then \
++      @if grep -v '^#' $(xtests) | $(EGREP) ':[       ]*make( |$$)'; then \
          echo 'Do not run "make" in the above tests.  Use "$$MAKE" instead.' 1>&2; \
          exit 1; \
        fi