summaryrefslogtreecommitdiff
path: root/PLANS
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2013-05-10 21:18:40 +0200
committerStefano Lattarini <stefano.lattarini@gmail.com>2013-05-10 21:18:40 +0200
commit0cf58ea7c1c05cdc7b6abff6edc68e934333d1e2 (patch)
treea4007dd22de95af4cc9440b3b7a1a85a562a1ba1 /PLANS
parent0dd95c8d51099aaca08fab7815e2c536908250e2 (diff)
parent7a2ff99d85c7abcd2753e9815fc8fdac4b13e38f (diff)
downloadautomake-0cf58ea7c1c05cdc7b6abff6edc68e934333d1e2.tar.gz
Merge branch 'maint'
* maint: news: document new 'subdir-objects' warning PLANS: one minor fixlet (mostly cosmetic) PLANS: we have already dropped support for split info files in master NEWS: fix a reference to Automake 1.14 where Automake 2.0 was intended PLANS: fix reference to non-existent 'next' branch PLANS: fix botched version reference maintcheck: fix two references to old location of aclocal and automake dist: deprecated shar and tar+compress formats
Diffstat (limited to 'PLANS')
-rw-r--r--PLANS/obsolete-removed/configure.in.txt6
-rw-r--r--PLANS/rm-f-without-args.txt4
-rw-r--r--PLANS/texi/drop-split-info-files.txt6
3 files changed, 8 insertions, 8 deletions
diff --git a/PLANS/obsolete-removed/configure.in.txt b/PLANS/obsolete-removed/configure.in.txt
index 180f92c14..d3f6da795 100644
--- a/PLANS/obsolete-removed/configure.in.txt
+++ b/PLANS/obsolete-removed/configure.in.txt
@@ -1,5 +1,5 @@
-In Automake 1.13.x
-------------------
+In Automake 1.13.x (once planned, then dropped)
+-----------------------------------------------
We are already warning about 'configure.in' used as the name for the
Autoconf input file ('configure.ac' should be used instead); we've
@@ -24,5 +24,5 @@ that Autoconf will actually have started deprecating 'configure.in'
by the time Automake 2.0 is released.
Note that the removal of 'configure.in' has already been implemented
-in our 'next' branch (from where the 2.0 release will be finally
+in our 'master' branch (from where the 2.0 release will be finally
cut); see commits 'v1.13-17-gbff57c8' and 'v1.13-21-g7626e63'.
diff --git a/PLANS/rm-f-without-args.txt b/PLANS/rm-f-without-args.txt
index 918e0492d..b940fc3e9 100644
--- a/PLANS/rm-f-without-args.txt
+++ b/PLANS/rm-f-without-args.txt
@@ -13,8 +13,8 @@ accordingly, to get rid of the awful idiom:
See automake bug#10828.
-For Automake 1.13.2 (DONE)
---------------------------
+For Automake 1.14 (DONE)
+------------------------
Add a temporary "probe check" in AM_INIT_AUTOMAKE that verifies that
the no-args "rm -f" usage is supported on the system configure is
diff --git a/PLANS/texi/drop-split-info-files.txt b/PLANS/texi/drop-split-info-files.txt
index 8b36ecb05..a0a5636e7 100644
--- a/PLANS/texi/drop-split-info-files.txt
+++ b/PLANS/texi/drop-split-info-files.txt
@@ -1,7 +1,7 @@
-For automake 2.0
-----------------
+For in Automake 2.0 (DONE)
+--------------------------
-We want to drop split info files in Automake 2.0.
+We will drop split info files in Automake 2.0.
See automake bug#13351: <http://debbugs.gnu.org/13351>.
Basically, it has been confirmed that the original reason behind