summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Duret-Lutz <adl@gnu.org>2004-10-12 19:56:26 +0000
committerAlexandre Duret-Lutz <adl@gnu.org>2004-10-12 19:56:26 +0000
commitecf27feb2a25fe543d817731af9189c460ee7f6d (patch)
tree00d9999172cfa3d013f4d9d92d4c8e909707d848
parent9d2a266363eea1db9637b2e059397229315a3344 (diff)
downloadautomake-ecf27feb2a25fe543d817731af9189c460ee7f6d.tar.gz
* 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.
-rw-r--r--ChangeLog4
-rw-r--r--doc/automake.texi11
-rw-r--r--doc/stamp-vti2
-rw-r--r--doc/version.texi2
4 files changed, 15 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 6f22dba6b..f3d6466b5 100644
--- 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 1e22b56a2..af989206c 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -5441,7 +5441,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}.
@@ -5458,7 +5458,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
@@ -6823,6 +6823,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 1c359c36d..65cc8de82 100644
--- 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.9.2a
@set VERSION 1.9.2a
diff --git a/doc/version.texi b/doc/version.texi
index 1c359c36d..65cc8de82 100644
--- 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.9.2a
@set VERSION 1.9.2a