* automake.in (@common_files): Move configure, configure.ac, and

configure.in ...
(@common_sometimes): ... here so that these files do not appear
twice in DIST_COMMON.

diff --git a/ChangeLog b/ChangeLog
index 564b76f7624573d09d7ab7926d5c5a0719a7998c..af475bb0f62c6fa5392801cf9282cef88d8a6502 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2003-12-27  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       * automake.in (@common_files): Move configure, configure.ac, and
+       configure.in ...
+       (@common_sometimes): ... here so that these files do not appear
+       twice in DIST_COMMON.
+
        * automake.in (maybe_push_required_file): Add $(srcdir) in front
        a required files outside the current directory or its subdirectories.
        * lib/am/distdir.am (distdir): Update comment.

diff --git a/Makefile.in b/Makefile.in
index d3d5ca9741321555d76903f70a460a10048f9f6d..c084eb0214920b00b6461de62aad09bd47da4c17 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -37,7 +37,7 @@ POST_UNINSTALL = :
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
        $(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \
-       ChangeLog INSTALL NEWS THANKS TODO configure configure.ac
+       ChangeLog INSTALL NEWS THANKS TODO
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/amversion.m4 \
        $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/init.m4 \

diff --git a/automake.in b/automake.in
index 194c6f6e65665ef53a3312c8ebc35de7555b13da..c6cf31ea93f8096c73b4e194329bbff182c46b0f 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -214,14 +214,15 @@ my @common_files =
     (qw(ABOUT-GNU ABOUT-NLS AUTHORS BACKLOG COPYING COPYING.DOC COPYING.LIB
        COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO
        ansi2knr.1 ansi2knr.c compile config.guess config.rpath config.sub
-       configure configure.ac configure.in depcomp elisp-comp
-       install-sh libversion.in mdate-sh missing mkinstalldirs
-       py-compile texinfo.tex ylwrap),
+       depcomp elisp-comp install-sh libversion.in mdate-sh missing
+       mkinstalldirs py-compile texinfo.tex ylwrap),
      @libtool_files, @libtool_sometimes);
 
-# Commonly used files we auto-include, but only sometimes.
+# Commonly used files we auto-include, but only sometimes.  This list
+# is used for the --help output only.
 my @common_sometimes =
-    qw(aclocal.m4 acconfig.h config.h.top config.h.bot stamp-vti);
+  qw(aclocal.m4 acconfig.h config.h.top config.h.bot configure
+     configure.ac configure.in stamp-vti);
 
 # Standard directories from the GNU Coding Standards, and additional
 # pkg* directories from Automake.  Stored in a hash for fast member check.