[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-208-g6bc3060

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=6bc306097ad74dfafd445243f69a13bda2139505

The branch, maint has been updated
       via  6bc306097ad74dfafd445243f69a13bda2139505 (commit)
       via  20abe4e50f9beb3bf36a6b8796d7230caa92813a (commit)
      from  627f0a91fce4a715f871334342d4bdd877670dc2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6bc306097ad74dfafd445243f69a13bda2139505
Author: Stefano Lattarini <address@hidden>
Date:   Wed Sep 22 22:31:22 2010 +0200

    Manual: be more agnostic w.r.t. version control system used.
    
    * doc/automake.texi (Basics of Distribution): Also refer to `.svn'
    directories as a type of probably-unwanted files that are copied
    regardless when adding directories to EXTRA_DIST.
    (The dist Hook): Show a dist-hook example which removes Subversion
    `.svn' private directories from distdir, rather than CVS private
    directories.
    (missing and AM_MAINTAINER_MODE): Try to be more agnostic w.r.t.
    the version control system used.

commit 20abe4e50f9beb3bf36a6b8796d7230caa92813a
Author: Stefano Lattarini <address@hidden>
Date:   Wed Sep 22 22:04:55 2010 +0200

    Manual: index refer to target "git-dist", not "cvs-dist".
    
    * doc/automake.texi (General Operation): Index the non-standard
    example about "git-dist" under the "git-dist" label, not under
    the "cvs-dist" one.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog         |   15 +++++++++++++++
 doc/automake.texi |   22 +++++++++++-----------
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 00b9e4b..43d1996 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
 2010-09-22  Stefano Lattarini  <address@hidden>
 
+       Manual: be more agnostic w.r.t. version control system used.
+       * doc/automake.texi (Basics of Distribution): Also refer to `.svn'
+       directories as a type of probably-unwanted files that are copied
+       regardless when adding directories to EXTRA_DIST.
+       (The dist Hook): Show a dist-hook example which removes Subversion
+       `.svn' private directories from distdir, rather than CVS private
+       directories.
+       (missing and AM_MAINTAINER_MODE): Try to be more agnostic w.r.t.
+       the version control system used.
+
+       Manual: index refer to target "git-dist", not "cvs-dist".
+       * doc/automake.texi (General Operation): Index the non-standard
+       example about "git-dist" under the "git-dist" label, not under
+       the "cvs-dist" one.
+
        Perl modules: remove references to "Automake CVS repository".
        * lib/Automake/Channels.pm: Update comments to refer to "Automke's
        git repository" rather than to "Automake's CVS repository".
diff --git a/doc/automake.texi b/doc/automake.texi
index 4d29513..e3589d8 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -1759,8 +1759,7 @@ for instance, a @code{bin_PROGRAMS} variable definition 
will cause rules
 for compiling and linking programs to be generated.
 
 @cindex Non-standard targets
address@hidden @code{cvs-dist}, non-standard example
address@hidden cvs-dist
address@hidden @code{git-dist}, non-standard example
 @trindex git-dist
 
 The variable definitions and rules in the @file{Makefile.am} are
@@ -8247,8 +8246,8 @@ subdirectories in @code{EXTRA_DIST}.
 You can also mention a directory in @code{EXTRA_DIST}; in this case the
 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.
+including, e.g., Subversion's @file{.svn} private directories or CVS/RCS
+version control files.  We recommend against using this feature.
 
 @vindex SUBDIRS
 @vindex DIST_SUBDIRS
@@ -8309,7 +8308,7 @@ recursively included by specifying a directory in 
EXTRA_DIST:
 EXTRA_DIST = doc
 
 dist-hook:
-        rm -rf `find $(distdir)/doc -name CVS`
+        rm -rf `find $(distdir)/doc -type d -name .svn`
 @end example
 
 @vindex distdir
@@ -10535,9 +10534,10 @@ Besides the warning, when a tool is missing, 
@command{missing} will
 attempt to fix timestamps in a way that allows the build to continue.
 For instance, @command{missing} will touch @file{configure} if
 @command{autoconf} is not installed.  When all distributed files are
-kept under CVS, this feature of @command{missing} allows a user
address@hidden no maintainer tools} to build a package off CVS, bypassing
-any timestamp inconsistency implied by @samp{cvs update}.
+kept under version control, this feature of @command{missing} allows a
+user @emph{with no maintainer tools} to build a package off its version
+control repository, bypassing any timestamp inconsistency (implied by
+e.g.@: @samp{cvs update} or @samp{git clone}).
 
 If the required tool is installed, @command{missing} will run it and
 won't attempt to continue after failures.  This is correct during
@@ -10592,9 +10592,9 @@ swayed by Fran@,{c}ois's arguments, and got rid of
 @code{AM_MAINTAINER_MODE} in all of his packages.
 
 Still many people continue to use @code{AM_MAINTAINER_MODE}, because
-it helps them working on projects where all files are kept under CVS,
-and because @command{missing} isn't enough if you have the wrong
-version of the tools.
+it helps them working on projects where all files are kept under version
+control, and because @command{missing} isn't enough if you have the
+wrong version of the tools.
 
 
 @node Wildcards


hooks/post-receive
-- 
GNU Automake