]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
Merge branch 'am-prog-mkdir-p-remove'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Fri, 28 Dec 2012 18:04:02 +0000 (19:04 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Fri, 28 Dec 2012 18:04:02 +0000 (19:04 +0100)
Finally backporting the AM_PROG_MKDIR_P removal that has already taken
place in Automake-NG.  We can safely do this since the latest Gettext
release (1.18.2) has removed all uses of AM_PROG_MKDIR_P, replacing
them with uses of AC_PROG_MKDIR_P instead.

References:
<http://lists.gnu.org/archive/html/bug-gettext/2012-12/msg00064.html>
<http://lists.gnu.org/archive/html/automake/2012-12/msg00024.html>
Commit v0.18.1.1-147-g2cccb4c in the Gettext git repository.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
1  2 
Makefile.am
automake.in
doc/automake.texi
t/gettext-macros.sh
t/list-of-tests.mk

diff --cc Makefile.am
Simple merge
diff --cc automake.in
index 3194c994888e3785e09eee5cbd16bedd20745685,9c0c8b9cc2d19e46db5ce6d415b10ea1c860b627..35aefd329ea2a7a42fecc813c7464a08c107b7a1
@@@ -5129,9 -5128,8 +5129,8 @@@ sub scan_autoconf_traces ($
                AC_REQUIRE_AUX_FILE => 1,
                AC_SUBST_TRACE => 1,
                AM_AUTOMAKE_VERSION => 1,
-                 AM_PROG_MKDIR_P => 0, # FIXME: to be removed in 1.14
                AM_CONDITIONAL => 2,
 -              _AM_EXTRA_RECURSIVE_TARGETS => 1,
 +              AM_EXTRA_RECURSIVE_TARGETS => 1,
                AM_GNU_GETTEXT => 0,
                AM_GNU_GETTEXT_INTL_SUBDIR => 0,
                AM_INIT_AUTOMAKE => 0,
Simple merge
Simple merge
Simple merge