[Automake-commit] [SCM] GNU Automake branch, branch-1-10, updated. Release-1-10-1-22-g1bfcc46

[Ralf Wildenhues]

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=1bfcc46726983c1c57f0612744526498ae49ea3e

The branch, branch-1-10 has been updated
       via  1bfcc46726983c1c57f0612744526498ae49ea3e (commit)
      from  f71654207652a4e400705f005792cf6ae9bc0d28 (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 1bfcc46726983c1c57f0612744526498ae49ea3e
Author: Karl Berry <address@hidden>
Date:   Wed Jun 4 20:45:56 2008 +0200

    Improve description of -local and -hook targets.
    
    * doc/automake.texi (Install, Hard-Coded Install Paths):  Fix
    punctuation and markup.
    (Extending): Improve wording and clarify order semantics of
    *-local and *-hook targets.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog         |    7 +++++++
 doc/automake.texi |   27 ++++++++++++++++-----------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6bf0ca6..a31450b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-06-04  Karl Berry  <address@hidden>
+
+       * doc/automake.texi (Install, Hard-Coded Install Paths):  Fix
+       punctuation and markup.
+       (Extending): Improve wording and clarify order semantics of
+       *-local and *-hook targets.
+
 2008-06-01  Ralf Wildenhues  <address@hidden>
 
        * doc/automake.texi (Extending): Fix grammar.
diff --git a/doc/automake.texi b/doc/automake.texi
index a89c4fb..32a4709 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -7717,7 +7717,7 @@ Automake also supports two install hooks, 
@code{install-exec-hook} and
 @code{install-data-hook}.  These hooks are run after all other install
 rules of the appropriate type, exec or data, have completed.  So, for
 instance, it is possible to perform post-installation modifications
-using an install hook.  @ref{Extending} gives some examples.
+using an install hook.  @xref{Extending}, for some examples.
 @cindex Install hook
 
 @section Staged installs
@@ -9168,23 +9168,28 @@ clean-local:
         -rm -rf testSubDir
 @end example
 
-Older version of this manual used to show how to use
address@hidden to install a file to some hard-coded
-location, but you should avoid this.  (@pxref{Hard-Coded Install Paths})
+You may be tempted to use @code{install-data-local} to install a file
+to some hard-coded location, but you should avoid this
+(@pxref{Hard-Coded Install Paths}).
+
+With the @code{-local} targets, there is no particular guarantee of
+execution order; typically, they are run early, but with parallel
+make, there is no way to be sure of that.
 
 @cindex @option{-hook} targets
 @cindex hook targets
-
-Some rules also have a way to run another rule, called a @dfn{hook},
-after their work is done.  The hook is named after the principal target,
-with @samp{-hook} appended.  The targets allowing hooks are
address@hidden, @code{install-exec}, @code{uninstall}, @code{dist},
-and @code{distcheck}.
 @trindex install-data-hook
 @trindex install-exec-hook
 @trindex uninstall-hook
 @trindex dist-hook
 
+In contrast, some rules also have a way to run another rule, called a
address@hidden; these are always executed after their work is done.  The
+hook is named after the principal target, with @samp{-hook} appended.
+The targets allowing hooks are @code{install-data},
address@hidden, @code{uninstall}, @code{dist}, and
address@hidden
+
 For instance, here is how to create a hard link to an installed program:
 
 @example
@@ -10771,7 +10776,7 @@ should not be concerned by such site policies: use the 
appropriate
 standard directory variable to install your files so that installer
 can easily redefine these variables to match their site conventions.
 
-Installing files that should be used by another package, is slightly
+Installing files that should be used by another package is slightly
 more involved.  Let's take an example and assume you want to install
 shared library that is a Python extension module.  If you ask Python
 where to install the library, it will answer something like this:


hooks/post-receive
--
GNU Automake