FYI: Reorder the dist-hook section (branch-1-7)

[Alexandre Duret-Lutz]

Is is the part of the previous patch I posted (about top_distdir
and distdir) that I'm checking in on branch-1-7.

2003-01-21  Alexandre Duret-Lutz  <address@hidden>

        * automake.texi (Dist): Reorder the dist-hook section, and
        move the DIST_SUBDIRS paragraph earlier.

Index: automake.texi
===================================================================
RCS file: /cvs/automake/automake/automake.texi,v
retrieving revision 1.305.2.11
diff -u -r1.305.2.11 automake.texi
--- automake.texi       19 Jan 2003 15:20:17 -0000      1.305.2.11
+++ automake.texi       21 Jan 2003 17:06:18 -0000
@@ -4389,9 +4389,17 @@
 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}).
address@hidden DIST_SUBDIRS
+
 @section Fine-grained distribution control
 
 Sometimes you need tighter control over what does @emph{not} go into the
@@ -4416,27 +4424,7 @@
 
 @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:
-
address@hidden
-EXTRA_DIST = doc
-
-dist-hook:
-       rm -rf `find $(distdir)/doc -name CVS`
address@hidden 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.
address@hidden 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
@@ -4447,6 +4435,16 @@
 dist-hook:
         mkdir $(distdir)/random
         cp -p $(srcdir)/random/a1 $(srcdir)/random/a2 $(distdir)/random
address@hidden example
+
+Another way to to use this is for removing unnecessary files that get
+recursively included by specifying a directory in EXTRA_DIST:
+
address@hidden
+EXTRA_DIST = doc
+
+dist-hook:
+       rm -rf `find $(distdir)/doc -name CVS`
 @end example
 
 @section Checking the distribution

-- 
Alexandre Duret-Lutz