From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Thu, 12 Jan 2006 19:54:02 +0000 (+0000)
Subject: 2006-01-12  Alexandre Duret-Lutz  <adl@gnu.org>
X-Git-Tag: Release-1-9b~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6af666a2fcf91ac91fb0560822c908397a667fa8;p=thirdparty%2Fautomake.git

2006-01-12  Alexandre Duret-Lutz  <adl@gnu.org>

* tests/txinfo13.test: Test fix below.

2006-01-12  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

* lib/am/texinfos.am (dist-info): Tighten glob to avoid unwanted
extra files in distribution.  Reported by Vincent Lefevre.
---

diff --git a/ChangeLog b/ChangeLog
index 8f73110f1..db52864e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-01-12  Alexandre Duret-Lutz  <adl@gnu.org>
+
+	* tests/txinfo13.test: Test fix below.
+
+2006-01-12  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* lib/am/texinfos.am (dist-info): Tighten glob to avoid unwanted
+	extra files in distribution.  Reported by Vincent Lefevre.
+
 2006-01-06  Alexandre Duret-Lutz  <adl@gnu.org>
 
 	* doc/automake.texi (Linking, Program and Library Variables):
diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 046fca781..dd2fdec66 100644
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -1,7 +1,7 @@
 ## automake - create Makefile.in from Makefile.am
 
 ## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-## 2003, 2004, 2005 Free Software Foundation, Inc.
+## 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -344,11 +344,14 @@ dist-info: $(INFO_DEPS)
 	    $(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \
 	  esac; \
 	  if test -f $$base; then d=.; else d=$(srcdir); fi; \
-	  for file in $$d/$$base*; do \
+	  base_i=`echo "$$base" | sed 's|\.info$$||;s|$$|.i|'`; \
+	  for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9] $$d/$$base_i[0-9] $$d/$$base_i[0-9][0-9]; do \
+	    if test -f $$file; then \
 ## Strip leading '$$d/'.
-	    relfile=`expr "$$file" : "$$d/\(.*\)"`; \
-	    test -f $(distdir)/$$relfile || \
-	      cp -p $$file $(distdir)/$$relfile; \
+	      relfile=`expr "$$file" : "$$d/\(.*\)"`; \
+	      test -f $(distdir)/$$relfile || \
+		cp -p $$file $(distdir)/$$relfile; \
+	    else :; fi; \
 	  done; \
 	done
 endif %?LOCAL-TEXIS%
diff --git a/tests/txinfo13.test b/tests/txinfo13.test
index a5202c6a7..4b19c3747 100755
--- a/tests/txinfo13.test
+++ b/tests/txinfo13.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2006  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -18,8 +18,9 @@
 # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-1301, USA.
 
-# Check for subdir Texinfo.
-# PR/343
+# Check for subdir Texinfo (PR/343)
+# Also make sure we do not distribute too much foo.info* files (Report
+# from Vincent Lefevre)
 
 required='makeinfo tex texi2dvi-o'
 . ./defs || exit 1
@@ -34,6 +35,8 @@ subdir_main_TEXINFOS = subdir/inc.texi
 
 installcheck-local:
 	test -f $(infodir)/main.info
+check-local:
+	test ! -f $(srcdir)/subdir/main.info.bak
 END
 
 mkdir subdir
@@ -53,6 +56,7 @@ cat > subdir/inc.texi << 'END'
 I'm included.
 END
 
+touch subdir/main.info.bak
 
 $ACLOCAL
 $AUTOMAKE --add-missing
@@ -64,3 +68,4 @@ cd build
 $MAKE distcheck
 test -f ../subdir/main.info
 test ! -f subdir/main.info
+test -f ../subdir/main.info.bak