From 4a1695cf317ef7fb8d1ba0ccdfee3a28973441cb Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Tue, 21 Jan 2003 18:05:52 +0000 Subject: [PATCH] * automake.texi (Dist): Reorder the dist-hook section, and move the DIST_SUBDIRS paragraph earlier. --- ChangeLog | 5 +++++ automake.texi | 40 +++++++++++++++++++--------------------- stamp-vti | 2 +- version.texi | 2 +- 4 files changed, 26 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index 53cbfa686..145d98471 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-01-21 Alexandre Duret-Lutz + + * automake.texi (Dist): Reorder the dist-hook section, and + move the DIST_SUBDIRS paragraph earlier. + 2003-01-19 Alexandre Duret-Lutz * tests/README: New file. diff --git a/automake.texi b/automake.texi index 6ea95e4c4..7fadd54ef 100644 --- a/automake.texi +++ b/automake.texi @@ -4389,9 +4389,17 @@ entire directory will be recursively copied into the distribution. Please note that this will also copy @emph{everything} in the directory, including CVS/RCS version control files. We recommend against using this feature. - @vindex EXTRA_DIST +If you define @code{SUBDIRS}, Automake will recursively include the +subdirectories in the distribution. If @code{SUBDIRS} is defined +conditionally (@pxref{Conditionals}), Automake will normally include all +directories that could possibly appear in @code{SUBDIRS} in the +distribution. If you need to specify the set of directories +conditionally, you can set the variable @code{DIST_SUBDIRS} to the exact +list of subdirectories to include in the distribution (@pxref{Top level}). +@vindex DIST_SUBDIRS + @section Fine-grained distribution control Sometimes you need tighter control over what does @emph{not} go into the @@ -4416,27 +4424,7 @@ nodist_foo_SOURCES = do-not-distribute.c @section The dist hook -Another way to to use this is for removing unnecessary files that get -recursively included by specifying a directory in EXTRA_DIST: - -@example -EXTRA_DIST = doc - -dist-hook: - rm -rf `find $(distdir)/doc -name CVS` -@end example - -If you define @code{SUBDIRS}, Automake will recursively include the -subdirectories in the distribution. If @code{SUBDIRS} is defined -conditionally (@pxref{Conditionals}), Automake will normally include all -directories that could possibly appear in @code{SUBDIRS} in the -distribution. If you need to specify the set of directories -conditionally, you can set the variable @code{DIST_SUBDIRS} to the exact -list of subdirectories to include in the distribution. -@vindex DIST_SUBDIRS - @trindex dist-hook - Occasionally it is useful to be able to change the distribution before it is packaged up. If the @code{dist-hook} target exists, it is run after the distribution directory is filled, but before the actual tar @@ -4449,6 +4437,16 @@ dist-hook: cp -p $(srcdir)/random/a1 $(srcdir)/random/a2 $(distdir)/random @end example +Another way to to use this is for removing unnecessary files that get +recursively included by specifying a directory in EXTRA_DIST: + +@example +EXTRA_DIST = doc + +dist-hook: + rm -rf `find $(distdir)/doc -name CVS` +@end example + @section Checking the distribution @cindex make distcheck diff --git a/stamp-vti b/stamp-vti index 54cd6dc63..0e727ef13 100644 --- a/stamp-vti +++ b/stamp-vti @@ -1,4 +1,4 @@ -@set UPDATED 14 January 2003 +@set UPDATED 21 January 2003 @set UPDATED-MONTH January 2003 @set EDITION 1.7.2a @set VERSION 1.7.2a diff --git a/version.texi b/version.texi index 54cd6dc63..0e727ef13 100644 --- a/version.texi +++ b/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 14 January 2003 +@set UPDATED 21 January 2003 @set UPDATED-MONTH January 2003 @set EDITION 1.7.2a @set VERSION 1.7.2a -- 2.11.4.GIT