Merge branch 'maint'

* maint:
  AM_PROG_MKDIR_P: deprecate, to be removed in Automake 1.13

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

diff --cc NEWS
index 8653603cd0325115a33f29eeb8213465b1ad35a6,b415be6779b0b741fa3e600aa42dd8b2829f886b..f0a3b55546d91ce96d1819c8516d3e8295c3c467
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,29 -1,14 +1,40 @@@
 +New in 1.13:
 +
 +* Obsolete features removed:
 +
 +  - The deprecated aclocal option '--acdir' has been removed.  You
 +    should use the options '--automake-acdir' and '--system-acdir'
 +    instead (which have been introduced in Automake 1.11.2).
 +
 +  - The following long-obsolete m4 macros have been removed:
 +
 +      AM_PROG_CC_STDC:    superseded by AC_PROG_CC since October 2002
 +      fp_PROG_CC_STDC:    broken alias for AM_PROG_CC_STDC
 +      fp_WITH_DMALLOC:    old alias for AM_WITH_DMALLOC
 +      AM_CONFIG_HEADER:   superseded by AC_CONFIG_HEADERS since July 2002
 +      ud_PATH_LISPDIR:    old alias for AM_PATH_LISPDIR
 +      jm_MAINTAINER_MODE: old alias for AM_MAINTAINER_MODE
 +      ud_GNU_GETTEXT:     old alias for AM_GNU_GETTEXT
 +      gm_PROG_LIBTOOL:    old alias for AC_PROG_LIBTOOL
 +      fp_C_PROTOTYPES:    old alias for AM_C_PROTOTYPES (which was part
 +                          of the now-removed automatic de-ANSI-fication
 +                          support of Automake)
 +
 +  - All the "old alias" macros in 'm4/obsolete.m4' have been removed.
 +
 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 +
+ New in 1.12.1:
+ 
+ * Deprecated obsolescent features:
+ 
+   - The long-obsolete (since 1.10) automake-provided $(mkdir_p) make
+     variable, @mkdir_p@ configure-time substitution and AM_PROG_MKDIR
+     m4 macro are deprecated, eliciting a warning in the 'obsolete'
+     category.  They will be removed in the next major version (1.13).
+ 
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ 
  New in 1.12:
  
  * WARNING: Future backward-incompatibilities!
@@@ -48,11 -51,11 +59,6 @@@
      AM_INIT_AUTOMAKE macro will be deprecated in the next minor version
      of Automake (1.12.1) and removed in the next major version (1.13).
  
-   - The long-obsolete (since 1.10) automake-provided $(mkdir_p) make
-     variable, @mkdir_p@ substitution and AM_PROG_MKDIR m4 macro will
-     all be deprecated in the next minor version of Automake (1.12.1)
-     and removed in the next major version (1.13).
 -  - The '--acdir' option of aclocal is deprecated, and will probably
 -    be removed in the next major Automake release (1.13).  You should
 -    use the options '--automake-acdir' and '--system-acdir' instead
 -    (which have been introduced in Automake 1.11.2).
--
    - The exact order in which the directories in the aclocal macro
      search path are looked up is probably going to be changed in the
      next Automake release (1.13).

diff --cc t/list-of-tests.mk
Simple merge