From: Eric Blake <ebb9@byu.net>
Date: Fri, 19 Oct 2007 00:38:34 +0000 (-0600)
Subject: Ignore `make dist' changelogs in testsuite.log.
X-Git-Tag: v2.62~199
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32d3effc40303d8f8bd2351ef150baad1eb9b5ab;p=thirdparty%2Fautoconf.git

Ignore `make dist' changelogs in testsuite.log.

* lib/autotest/general.m4 (AT_INIT) <ChangeLogs>: Prune
directories matching AT_PACKAGE_TARNAME-*.

Signed-off-by: Eric Blake <ebb9@byu.net>
---

diff --git a/ChangeLog b/ChangeLog
index 483e6db4..94f94a3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-10-18  Eric Blake  <ebb9@byu.net>
 
+	Ignore `make dist' changelogs in testsuite.log.
+	* lib/autotest/general.m4 (AT_INIT) <ChangeLogs>: Prune
+	directories matching AT_PACKAGE_TARNAME-*.
+
 	Fix AT_TESTED, AT_KEYWORDS.
 	* lib/m4sugar/m4sugar.m4 (m4_append_uniq): Warn if separator
 	occurs in string, as duplicates may be added.
diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index 93358749..abed58fa 100644
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -744,11 +744,14 @@ AS_BOX(m4_defn([AT_TESTSUITE_NAME])[.])
   # Try to find a few ChangeLogs in case it might help determining the
   # exact version.  Use the relative dir: if the top dir is a symlink,
   # find will not follow it (and options to follow the links are not
-  # portable), which would result in no output here.
+  # portable), which would result in no output here.  Prune directories
+  # matching the package tarname, since they tend to be leftovers from
+  # `make dist' or `make distcheck' and contain redundant or stale logs.
   if test -n "$at_top_srcdir"; then
     AS_BOX([ChangeLogs.])
     echo
-    for at_file in `find "$at_top_srcdir" -name ChangeLog -print`
+    for at_file in `find "$at_top_srcdir" m4_ifdef([AT_PACKAGE_TARNAME],
+[-name "AT_PACKAGE_TARNAME-*" -prune -o ])-name ChangeLog -print`
     do
       AS_ECHO(["$as_me: $at_file:"])
       sed 's/^/| /;10q' $at_file