Fixes automake bug#16827 and bug#16997.
Signed-off-by: Stefano Lattarini <stefano.lattar...@gmail.com>
---
NEWS | 3 +++
THANKS | 1 +
doc/automake.texi | 2 +-
lib/am/distdir.am | 8 ++++----
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/NEWS b/NEWS
index c863f0e..9fbd3ca 100644
--- a/NEWS
+++ b/NEWS
@@ -102,6 +102,9 @@ New in 1.15:
- The user can now extend the special .PRECIOUS target, the same way
he could already do with the .MAKE .and .PHONY targets.
+ - Fixed confusing typos in the manual and in some warning messages
+ (automake bug#16827 and bug#16997).
+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
New in 1.14.1:
diff --git a/THANKS b/THANKS
index 58dac98..550b565 100644
--- a/THANKS
+++ b/THANKS
@@ -6,6 +6,7 @@ Adam J. Richter a...@yggdrasil.com
Adam Mercer ramer...@gmail.com
Adam Sampson a...@offog.org
Adrian Bunk b...@fs.tum.de
+Aharon Robbins arn...@skeeve.com
Akim Demaille a...@gnu.org
Alan Modra amo...@bigpond.net.au
Alex Hornby a...@anvil.co.uk
diff --git a/doc/automake.texi b/doc/automake.texi
index d9083a0..8b92e1c 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -9144,7 +9144,7 @@ and @samp{./wrapper-script -d baz} to produce
@file{foo.log},
as a side-effect.
It's important to note that, differently from what we've seen for the
-serial test harness (@pxref{Parallel Test Harness}), the
+serial test harness (@pxref{Serial Test Harness}), the
@code{AM_TESTS_ENVIRONMENT} and @code{TESTS_ENVIRONMENT} variables
@emph{cannot} be use to define a custom test runner; the
@code{LOG_COMPILER} and @code{LOG_FLAGS} (or their extension-specific
diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index a8ad63c..f26a857 100644
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -339,8 +339,8 @@ dist-xz: distdir
?COMPRESS?DIST_ARCHIVES += $(distdir).tar.Z
.PHONY: dist-tarZ
dist-tarZ: distdir
- @echo WARNING: "Support for shar distribution archives is" \
- "deprecated." >&2
+ @echo WARNING: "Support for distribution archives compressed with" \
+ "legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
@@ -348,8 +348,8 @@ dist-tarZ: distdir
?SHAR?DIST_ARCHIVES += $(distdir).shar.gz
.PHONY: dist-shar
dist-shar: distdir
- @echo WARNING: "Support for distribution archives compressed with" \
- "legacy program 'compress' is deprecated." >&2
+ @echo WARNING: "Support for shar distribution archives is" \
+ "deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
--
1.9.1
