Re: Bug#321689: automake1.9: "make dist" distributes too many files (dist-info)

[Ralf Wildenhues]

[ this is http://bugs.debian.org/321689 ]

* Vincent Lefevre wrote on Sun, Aug 07, 2005 at 12:00:21AM CEST:
> 
> In addition to the file <package>.info, I had a <package>.info.bak
> in the source directory, and when I did a "make dist", both files
> were included in the distribution. Only <package>.info should have
> been included.
> 
> I think that the dist-info rule in /usr/share/automake-1.9/am/texinfos.am
> is incorrect due to the wildcard * that captures too much.

Please try this patch (against CVS Automake, but should apply to
branch-1-9 as well).  Thanks.

It may be useful to refactor all texinfo rules to have the globs in one
macro.

Eric, please consider adding bug-automake at gnu.org when reporting
Automake bugs upstream.

Cheers,
Ralf

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

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  2 Jan 2006 12:45:52 -0000
@@ -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%