>From 7cffda4be4e467d3de1b5abacfa1c80f49c8069f Mon Sep 17 00:00:00 2001 Message-Id: In-Reply-To: References: From: Stefano Lattarini Date: Fri, 6 Jul 2012 10:12:30 +0200 Subject: [PATCH 2/2] compat: automake should define $(mkdir_p), for backward compatibility MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit That has been unwittingly broken by commit 'v1.12-19-g7a1eb9f' of 2012-04-28, "AM_PROG_MKDIR_P: deprecate, to be removed in Automake 1.13". Report from Benoit Sigoure and Diego Elio Pattenò: * lib/am/header-vars.am (mkdir_p): Define as an alias for $(MKDIR_P). * t/list-of-tests.mk (XFAIL_TESTS): Remove 't/mkdir_p.sh'. * NEWS: Update. Signed-off-by: Stefano Lattarini --- NEWS | 17 ++++++++++++++++- lib/am/header-vars.am | 5 +++++ t/list-of-tests.mk | 1 - 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index ee16961..d38554d 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,11 @@ New in 1.12.2: long-deprecated 'configure.in' name for the Autoconf input file. You are advised to use the recommended name 'configure.ac' instead. + - The long-obsolete (since automake 1.10) @mkdir_p@ configure-time + substitution and AM_PROG_MKDIR m4 macro will be removed in Automake + 1.13. The $(mkdir_p) should still remain available for the moment + though. + - Autoconf 2.65 or later will be required by the next major Automake version (1.13). Until now, Automake has required Autoconf version 2.62 or later. @@ -100,6 +105,16 @@ Bugs fixed in 1.12.2: compilation fails, it will still be rerun by further "make recheck" invocations. See automake bug#11791. +* Bugs introduced by 1.12.1: + + - Automake generated Makefiles define once again the $(mkdir_p) make + variable (simple ans an alias for $(MKDIR_P)), for better backward + compatibility. The '@mkdir_p@' substitution is however not enabled + by default anymore; anyone needing it should call the AM_PROG_MKDIR + m4 macro explicitly (beware that this macro has been deprecated since + the previous Automake release 1.12.1, and will be removed in Automake + 1.13). + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ New in 1.12.1: @@ -123,7 +138,7 @@ New in 1.12.1: - 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). + category. * Miscellaneous changes: diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am index ba4aa0b..c65e08c 100644 --- a/lib/am/header-vars.am +++ b/lib/am/header-vars.am @@ -77,6 +77,11 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +mkdir_p = $(MKDIR_P) + ## dejagnu.am uses these variables. Some users might rely on them too. ?BUILD?build_triplet = @build@ ?HOST?host_triplet = @host@ diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk index 61ac5c1..73c4127 100644 --- a/t/list-of-tests.mk +++ b/t/list-of-tests.mk @@ -38,7 +38,6 @@ t/override-conditional-2.sh \ t/dist-pr109765.sh \ t/instdir-cond2.sh \ t/java-nobase.sh \ -t/mkdir_p.sh \ t/objext-pr10128.sh \ t/parallel-tests-many.sh \ t/pr8365-remake-timing.sh \ -- 1.7.9.5