From 0bb2dbcd37a3cf85a7aae55b0df6e6d446d42f7e Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Sun, 8 Sep 2002 18:58:28 +0000 Subject: [PATCH] * automake.texi (Include): Fragments are always distributed. * NEWS: Likewise. --- ChangeLog | 5 +++++ NEWS | 1 + automake.texi | 4 ++-- stamp-vti | 4 ++-- version.texi | 4 ++-- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 77c16be..5e80295 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-09-08 Alexandre Duret-Lutz + + * automake.texi (Include): Fragments are always distributed. + * NEWS: Likewise. + 2002-09-08 Andreas Buening Fix for automake/334: diff --git a/NEWS b/NEWS index 9aa1c66..d0ed024 100644 --- 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 e40a090..bdeccba 100644 --- 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 78896f2..ef833cf 100644 --- 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 78896f2..ef833cf 100644 --- 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 -- 2.7.4