"make distcheck" vs. EXTRA_DIST files made during "make dist"

[Greg A. Woods]

I've just upgraded one of my small projects (NewSyslog) which uses GNU
Auto* to use the latest release of Automake (1.6.1) [and Autoconf-2.53].

I've encountered a problem with "make distcheck" which now trips over
files created during the "make dist" process but which are not checked
in as part of the source repository.

I happened to have this list of files defined in my Makefile.am like
this:

        DIST_MAKE = newsyslog.conf.cat5-dist newsyslog.cat8-dist

        EXTRA_DIST = $(DIST_OTHER) $(DIST_MAKE)

so the following fix seemed the most expedient way to repair Automake.
Perhaps the names I've chosen are not ideal, but I think this simple fix
is sufficient in its general form.

Index: automake.texi
===================================================================
RCS file: /cvs/automake/automake/automake.texi,v
retrieving revision 1.276
diff -c -r1.276 automake.texi
*** automake.texi       6 May 2002 06:51:05 -0000       1.276
--- automake.texi       11 May 2002 03:16:57 -0000
***************
*** 3835,3840 ****
--- 3835,3849 ----
  the @code{EXTRA_DIST} variable.  You can mention files from
  subdirectories in @code{EXTRA_DIST}.
  
+ If some of those files are generated then list them in
+ @code{DIST_MAKE} and include that variable when you set
+ @code{EXTRA_DIST}, like this:
+ 
+ @example
+ DIST_MAKE = hello.cat1-dist
+ EXTRA_DIST = $(DIST_MAKE)
+ @end example
+ 
  You can also mention a directory in @code{EXTRA_DIST}; in this case the
  entire directory will be recursively copied into the distribution.
  Please note that this will also copy @emph{everything} in the directory,
Index: lib/am/distdir.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/distdir.am,v
retrieving revision 1.32
diff -c -r1.32 distdir.am
*** lib/am/distdir.am   26 Mar 2002 10:48:35 -0000      1.32
--- lib/am/distdir.am   11 May 2002 03:16:57 -0000
***************
*** 291,297 ****
          && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
  ## Make sure to remove the dist file we created in the test build
  ## directory.
!         && rm -f $(distdir).tar.gz \
          && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
        $(am__remove_distdir)
        @echo "$(distdir).tar.gz is ready for distribution" | \
--- 291,297 ----
          && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
  ## Make sure to remove the dist file we created in the test build
  ## directory.
!         && rm -f $(distdir).tar.gz $(DIST_MAKE) \
          && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
        $(am__remove_distdir)
        @echo "$(distdir).tar.gz is ready for distribution" | \


-- 
                                                                Greg A. Woods

+1 416 218-0098;  <address@hidden>;  <address@hidden>;  <address@hidden>
Planix, Inc. <address@hidden>; VE3TCP; Secrets of the Weird <address@hidden>