[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Bug#321689: automake1.9: "make dist" distributes too many files (dis
From: |
Alexandre Duret-Lutz |
Subject: |
Re: Bug#321689: automake1.9: "make dist" distributes too many files (dist-info) |
Date: |
Thu, 12 Jan 2006 20:53:34 +0100 |
User-agent: |
Gnus/5.110003 (No Gnus v0.3) Emacs/22.0.50 (gnu/linux) |
>>> "RW" == Ralf Wildenhues <address@hidden> writes:
RW> Please try this patch (against CVS Automake, but should
RW> apply to branch-1-9 as well). Thanks.
Thanks, I'm checking the following in.
2006-01-12 Alexandre Duret-Lutz <address@hidden>
* tests/txinfo13.test: Test fix below.
2006-01-12 Ralf Wildenhues <address@hidden>
* lib/am/texinfos.am (dist-info): Tighten glob to avoid unwanted
extra files in distribution. Reported by Vincent Lefevre.
Index: lib/am/texinfos.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/texinfos.am,v
retrieving revision 1.118
diff -u -r1.118 texinfos.am
--- lib/am/texinfos.am 7 Aug 2005 07:41:05 -0000 1.118
+++ lib/am/texinfos.am 12 Jan 2006 19:52:59 -0000
@@ -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 @@
$(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%
Index: tests/txinfo13.test
===================================================================
RCS file: /cvs/automake/automake/tests/txinfo13.test,v
retrieving revision 1.5
diff -u -r1.5 txinfo13.test
--- tests/txinfo13.test 14 May 2005 20:28:56 -0000 1.5
+++ tests/txinfo13.test 12 Jan 2006 19:52:59 -0000
@@ -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 @@
installcheck-local:
test -f $(infodir)/main.info
+check-local:
+ test ! -f $(srcdir)/subdir/main.info.bak
END
mkdir subdir
@@ -53,6 +56,7 @@
I'm included.
END
+touch subdir/main.info.bak
$ACLOCAL
$AUTOMAKE --add-missing
@@ -64,3 +68,4 @@
$MAKE distcheck
test -f ../subdir/main.info
test ! -f subdir/main.info
+test -f ../subdir/main.info.bak
--
Alexandre Duret-Lutz
Shared books are happy books. http://www.bookcrossing.com/friend/gadl