* automake.texi (Include): Fragments are always distributed.

* NEWS: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 77c16bebad4b33092945e9415190c1d46b3e0c90..5e80295c7efa7f1e56be513708236beadd7a3ade 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-08  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       * automake.texi (Include): Fragments are always distributed.
+       * NEWS: Likewise.
+
 2002-09-08  Andreas Buening  <andreas.buening@nexgo.de>
 
        Fix for automake/334:

diff --git a/NEWS b/NEWS
index 9aa1c667adf73b756f1b58ca7b59c64d8d40caba..d0ed024ff95a31a2e4c49e1f7cfb05594c53f37c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,7 @@ New in 1.6c:
   a DESTDIR install.
 * `+=' can be used in conditionals, even if the augmented variable
   was defined for another condition.
+* Makefile fragments (inserted with `include') are always distributed.
 * Use Autoconf's --trace interface to inspect configure.ac and get
   a more accurate view of it.
 * Add support for extending aclocal's default macro search path

diff --git a/automake.texi b/automake.texi
index e40a090243a0b886f2daf1ac41a8433689cd3542..bdeccba3e01354ad22290afc2908eee450ff7f0c 100644 (file)
--- a/automake.texi
+++ b/automake.texi
@@ -527,8 +527,6 @@ particularly not to include switches which are required for proper
 compilation of the package.  Since these variables are documented as
 being for the package builder, that person rightfully expects to be able
 to override any of these variables at build time.
-@c FIXME: maybe Automake could bark if a developer forces a user variable
-@c from Makefile.am.
 
 To get around this problem, automake introduces an automake-specific
 shadow variable for each user flag variable.  (Shadow variables are not
@@ -4681,6 +4679,8 @@ Include a fragment which is found relative to the top source directory.
 Note that if a fragment is included inside a conditional, then the
 condition applies to the entire contents of that fragment.
 
+Makefile fragments included this way are always distributed because
+there are needed to rebuild @file{Makefile.in}.
 
 @node Conditionals, Gnits, Include, Top
 @chapter Conditionals

diff --git a/stamp-vti b/stamp-vti
index 78896f2310048e505e964cebf7ca17fee2e00b70..ef833cf775ca4c053ea755d360ac75fba2f2f623 100644 (file)
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 24 August 2002
-@set UPDATED-MONTH August 2002
+@set UPDATED 8 September 2002
+@set UPDATED-MONTH September 2002
 @set EDITION 1.6c
 @set VERSION 1.6c

diff --git a/version.texi b/version.texi
index 78896f2310048e505e964cebf7ca17fee2e00b70..ef833cf775ca4c053ea755d360ac75fba2f2f623 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 24 August 2002
-@set UPDATED-MONTH August 2002
+@set UPDATED 8 September 2002
+@set UPDATED-MONTH September 2002
 @set EDITION 1.6c
 @set VERSION 1.6c