* doc/automake.texi (Scripts): Update the example about automake.

Mention `dist_' for distributed scripts.

diff --git a/ChangeLog b/ChangeLog
index 0fdcf2aed8873c13634fb0ae3ec5e817c676eb55..3a6cfaf8e2281a621309b97ce83279d61c3dcc47 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-09-26  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       * doc/automake.texi (Scripts): Update the example about automake.
+       Mention `dist_' for distributed scripts.
+
        * lib/mkinstalldirs: Clean up after NextStep and OpenStep mkdir.
        Suggested by Eric Sunshine.
 

diff --git a/doc/automake.texi b/doc/automake.texi
index 785acbae34f9bc68d7fe26278a77a5eeb808d57d..33038f182f71748795dc4968322d06e3a1464bd4 100644 (file)
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -3961,16 +3961,34 @@ should include the appropriate rules.
 Automake does not assume that scripts are derived objects; such objects
 must be deleted by hand (@pxref{Clean}).
 
-The @code{automake} program itself is a Perl script that is generated at
-configure time from @file{automake.in}.  Here is how this is handled:
+The @code{automake} program itself is a Perl script that is generated
+from @file{automake.in}.  Here is how this is handled:
 
 @example
 bin_SCRIPTS = automake
+CLEANFILES = $(bin_SCRIPTS)
+
+do_subst = sed -e 's,[@@]datadir[@@],$(datadir),g' \
+            -e 's,[@@]PERL[@@],$(PERL),g' \
+            -e 's,[@@]PACKAGE[@@],$(PACKAGE),g' \
+            -e 's,[@@]VERSION[@@],$(VERSION),g' \
+            @dots{}
+
+automake: automake.in Makefile
+        $(do_subst) < $(srcdir)/automake.in > automake
+        chmod +x automake
 @end example
 
-Since @code{automake} appears in the @code{AC_OUTPUT} macro, a target
-for it is automatically generated, and it is also automatically cleaned
-(despite the fact it's a script).
+Because---as we have just seen---scripts can be built, they are not
+distributed by default.  Scripts that should be distributed can be
+specified using a @code{dist_} prefix as in other primaries.  For
+instance the following @file{Makefile.am} declares that
+@file{my_script} should be distributed and installed in
+@code{$(sbindir)}.
+
+@example
+dist_sbin_SCRIPTS = my_script
+@end example
 
 @cindex SCRIPTS, installation directories
 @cindex Installing scripts

diff --git a/doc/stamp-vti b/doc/stamp-vti
index 7f9e704707719c79a9af2cba03655138a858611b..e8c195b069006e1d85fa445133d5a5c0428ae906 100644 (file)
--- a/doc/stamp-vti
+++ b/doc/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 24 September 2003
+@set UPDATED 26 September 2003
 @set UPDATED-MONTH September 2003
 @set EDITION 1.7a
 @set VERSION 1.7a

diff --git a/doc/version.texi b/doc/version.texi
index 7f9e704707719c79a9af2cba03655138a858611b..e8c195b069006e1d85fa445133d5a5c0428ae906 100644 (file)
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 24 September 2003
+@set UPDATED 26 September 2003
 @set UPDATED-MONTH September 2003
 @set EDITION 1.7a
 @set VERSION 1.7a