* doc/automake.texi (Install): Link to node Extending for examples.

(Extending): More comments about install-data-hook vs
install-exec-hook, and link to Install.

diff --git a/ChangeLog b/ChangeLog
index 7536657ead69bf4f53313de5792b50349eeccbfd..d64d649155ce7406452e8f36b0c828122cfc2df0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-10-12  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       * doc/automake.texi (Install): Link to node Extending for examples.
+       (Extending): More comments about install-data-hook vs
+       install-exec-hook, and link to Install.
+
        * configure.ac: Export @am_AUTOCONF@.
        * tests/defs.in (AUTOCONF): Define as @am_AUTOCONF@, not @AUTOCONF@,
        so the test suite runs `autoconf' and not `missing --run autoconf'.

diff --git a/doc/automake.texi b/doc/automake.texi
index b735056c9e7234181f5790ad53fd59a4df7054d1..c555a3c89a65e0598a108b7993365fd52df15a7f 100644 (file)
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -5461,7 +5461,7 @@ Variables using the standard directory prefixes @samp{bin}, @samp{sbin},
 @samp{install-exec}.
 
 Any variable using a user-defined directory prefix with @samp{exec} in
-the name (e.g. @samp{myexecbin_PROGRAMS} is installed by
+the name (e.g. @samp{myexecbin_PROGRAMS}) is installed by
 @samp{install-exec}.  All other user-defined prefixes are installed by
 @samp{install-data}.
 
@@ -5478,7 +5478,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.
+using an install hook.  @ref{Extending} gives some examples.
 @cindex Install hook
 
 @section Staged installs
@@ -6846,6 +6846,13 @@ Note that we rename the program so that a new version will erase the
 symbolic link, not the real binary.  Also we @code{cd} into the
 destination directory in order to create relative links.
 
+When writing @code{install-exec-hook} or @code{install-data-hook},
+please bear in mind that the exec/data distinction is based on the
+installation directory, not on the primary used (@pxref{Install}).  So
+a @code{foo_SCRIPTS} will be installed by @code{install-data}, and a
+@code{barexec_SCRIPTS} will be installed by @code{install-exec}.  You
+should define your hooks consequently.
+
 @c FIXME should include discussion of variables you can use in these
 @c rules
 

diff --git a/doc/stamp-vti b/doc/stamp-vti
index 4069ee15edac87c339f3eb8acee5e68675bbc417..32f8bea41a753b776144ac945b55bd28ed1ee593 100644 (file)
--- a/doc/stamp-vti
+++ b/doc/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 11 October 2004
+@set UPDATED 12 October 2004
 @set UPDATED-MONTH October 2004
 @set EDITION 1.9a
 @set VERSION 1.9a

diff --git a/doc/version.texi b/doc/version.texi
index 4069ee15edac87c339f3eb8acee5e68675bbc417..32f8bea41a753b776144ac945b55bd28ed1ee593 100644 (file)
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 11 October 2004
+@set UPDATED 12 October 2004
 @set UPDATED-MONTH October 2004
 @set EDITION 1.9a
 @set VERSION 1.9a