* automake.texi (Dist): Mention other distribution types.

	(Install): Updates.

diff --git a/ChangeLog b/ChangeLog
index dc027bc7933ca59b28beb263d361326e8ef01bd4..07814ef34c5f92426766dec883b3bc8aa530e5b7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-30  Tom Tromey  <tromey@redhat.com>
+
+       * automake.texi (Dist): Mention other distribution types.
+       (Install): Updates.
+
 2001-07-29  Tom Tromey  <tromey@redhat.com>
 
        * automake.texi (Program and Library Variables): Texinfo fix.

diff --git a/automake.texi b/automake.texi
index d4257b6bebd10f7febda8ff44fe10248add08ff3..354b69acdbf746b1282b7a6b1a8a64fc8cb25256 100644 (file)
--- a/automake.texi
+++ b/automake.texi
@@ -3339,6 +3339,8 @@ disallowed.
 @cindex Installation support
 @cindex make install support
 
+@section Basics of installation
+
 Naturally, Automake handles the details of actually installing your
 program once it has been built.  All files named by the various
 primaries are automatically installed in the appropriate places when the
@@ -3368,26 +3370,21 @@ nobase_include_HEADERS = stdio.h sys/types.h
 Will install @file{stdio.h} in @code{$(includedir)} and @file{types.h}
 in @code{$(includedir)/sys}.
 
+@section The two parts of install
+
 Automake generates separate @code{install-data} and @code{install-exec}
 targets, in case the installer is installing on multiple machines which
 share directory structure---these targets allow the machine-independent
-parts to be installed only once.  The @code{install} target depends on
-both of these targets.
+parts to be installed only once.  @code{install-exec} installs
+platform-dependent files, and @code{install-data} installs
+platform-independent files.  The @code{install} target depends on both
+of these targets.  While Automake tries to automatically segregate
+objects into the correct category, the @file{Makefile.am} author is, in
+the end, responsible for making sure this is done correctly.
 @trindex install-data
 @trindex install-exec
 @trindex install
-
-Automake also generates an @code{uninstall} target, an
-@code{installdirs} target, and an @code{install-strip} target.
-@trindex uninstall
-@trindex installdirs
-@trindex install-strip
-
-It is possible to extend this mechanism by defining an
-@code{install-exec-local} or @code{install-data-local} target.  If these
-targets exist, they will be run at @samp{make install} time.
-@trindex install-exec-local
-@trindex install-data-local
+@cindex Install, two parts of
 
 Variables using the standard directory prefixes @samp{data},
 @samp{info}, @samp{man}, @samp{include}, @samp{oldinclude},
@@ -3404,6 +3401,24 @@ the name (e.g. @samp{myexecbin_PROGRAMS} is installed by
 @samp{install-exec}.  All other user-defined prefixes are installed by
 @samp{install-data}.
 
+@section Extending installation
+
+It is possible to extend this mechanism by defining an
+@code{install-exec-local} or @code{install-data-local} target.  If these
+targets exist, they will be run at @samp{make install} time.  These
+rules can do almost anything; care is required.
+@trindex install-exec-local
+@trindex install-data-local
+
+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.
+@cindex Install hook
+
+@section Staged installs
+
 @vindex DESTDIR
 Automake generates support for the @samp{DESTDIR} variable in all
 install rules.  @samp{DESTDIR} is used during the @samp{make install}
@@ -3425,6 +3440,26 @@ This feature is commonly used to build install images and packages.  For
 more information, see @ref{Makefile Conventions, , , standards, The GNU
 Coding Standards}.
 
+Support for @samp{DESTDIR} is implemented by coding it directly into the
+install rules.  If your @file{Makefile.am} uses a local install rule
+(e.g., @code{install-exec-local}) or an install hook, then you must
+write that code to repsect @samp{DESTDIR}.
+
+@section Rules for the user
+
+Automake also generates an @code{uninstall} target, an
+@code{installdirs} target, and an @code{install-strip} target.
+@trindex uninstall
+@trindex installdirs
+@trindex install-strip
+
+Automake supports @code{uninstall-local} and @code{uninstall-hook}.
+There is no notion of separate uninstalls for ``exec'' and ``data'', as
+that does not make sense.
+
+Note that @code{uninstall} is not meant as a replacement for a real
+packaging tool.
+
 
 @node Clean, Dist, Install, Top
 @chapter What Gets Cleaned
@@ -3581,6 +3616,13 @@ anything, though as always caution is advised.  Generally this hook is
 used to check for potential distribution errors not caught by the
 standard mechanism.
 
+@section The types of distributions
+
+By default Automake generates a @samp{.tar.gz} file when asked to create
+a distribution.  However, some projects prefer different packaging
+formats.  Automake accomodates most of these using options;
+@ref{Options}.
+
 
 @node Tests, Options, Dist, Top
 @chapter Support for test suites

diff --git a/stamp-vti b/stamp-vti
index 1e9f0f0076802614b33708d3fa6ce90cdca483dd..94608d459e7df11d97cb6c61e685b577c610fa7f 100644 (file)
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 29 July 2001
+@set UPDATED 30 July 2001
 @set UPDATED-MONTH July 2001
 @set EDITION 1.4i
 @set VERSION 1.4i

diff --git a/version.texi b/version.texi
index 1e9f0f0076802614b33708d3fa6ce90cdca483dd..94608d459e7df11d97cb6c61e685b577c610fa7f 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 29 July 2001
+@set UPDATED 30 July 2001
 @set UPDATED-MONTH July 2001
 @set EDITION 1.4i
 @set VERSION 1.4i