* automake.texi (ANSI): Minor clarification.

	(Other GNU Tools): Don't mention Guile.
	(Guile): Removed.
	(Java Support): Mention file extensions.
	(Man pages): Mention dist_.  Don't mention info pages.

diff --git a/ChangeLog b/ChangeLog
index 63382268f68f5826d097fe5cbaf7cd98a2d69014..b56a7f05e08c25e9b6a6a415a421855a1d26d904 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-06-12  Tom Tromey  <tromey@redhat.com>
+
+       * automake.texi (ANSI): Minor clarification.
+       (Other GNU Tools): Don't mention Guile.
+       (Guile): Removed.
+       (Java Support): Mention file extensions.
+       (Man pages): Mention dist_.  Don't mention info pages.
+
 2001-06-11  Tom Tromey  <tromey@redhat.com>
 
        * automake.texi (Program variables): Document AM_CPPFLAGS.

diff --git a/automake.texi b/automake.texi
index 466d6b8c1fea54be93e223f0b358d03444ae4388..1d0d58b5dc97be7a07b85594d484b54c896f4a37 100644 (file)
--- a/automake.texi
+++ b/automake.texi
@@ -2472,6 +2472,9 @@ user macro @samp{GCJFLAGS}, should be used.
 
 @vindex AM_GCJFLAGS
 
+@code{gcj} can be used to compile @file{.java}, @file{.class},
+@file{.zip}, or @file{.jar} files.
+
 
 @node Support for Other Languages, ANSI, Java Support, Programs
 @comment  node-name,  next,  previous,  up
@@ -2493,7 +2496,7 @@ suffix rule handling; see @ref{Suffixes}.
 
 Although the GNU standards allow the use of ANSI C, this can have the
 effect of limiting portability of a package to some older compilers
-(notably SunOS).
+(notably the SunOS C compiler).
 
 Automake allows you to work around this problem on such machines by
 @dfn{de-ANSI-fying} each source file before the actual compilation takes
@@ -2746,7 +2749,6 @@ use in GNU programs, it tries hard to interoperate with other GNU tools.
 @menu
 * Emacs Lisp::                  Emacs Lisp
 * gettext::                     Gettext
-* Guile::                       Guile
 * Libtool::                     Libtool
 * Java::                        Java
 * Python::                      Python
@@ -2784,7 +2786,7 @@ strange setups to cope for themselves than to make the installation less
 nice for everybody else.
 
 
-@node gettext, Guile, Emacs Lisp, Other GNU Tools
+@node gettext, Libtool, Emacs Lisp, Other GNU Tools
 @section Gettext
 
 @cindex GNU Gettext support
@@ -2806,28 +2808,7 @@ in @file{configure.in} corresponds to all the valid @file{.po} files,
 and nothing more.
 
 
-@node Guile, Libtool, gettext, Other GNU Tools
-@section Guile
-
-Automake provides some automatic support for writing Guile modules.
-Automake will turn on Guile support if the @code{AM_INIT_GUILE_MODULE}
-macro is used in @file{configure.in}.
-
-Right now Guile support just means that the @code{AM_INIT_GUILE_MODULE}
-macro is understood to mean:
-@itemize @bullet
-@item
-@code{AM_INIT_AUTOMAKE} is run.
-
-@item
-@code{AC_CONFIG_AUX_DIR} is run, with a path of @file{..}.
-@end itemize
-
-As the Guile module code matures, no doubt the Automake support will
-grow as well.
-
-
-@node Libtool, Java, Guile, Other GNU Tools
+@node Libtool, Java, gettext, Other GNU Tools
 @section Libtool
 
 Automake provides support for GNU Libtool (@pxref{Top, , Introduction,
@@ -3148,21 +3129,21 @@ installed by default.  The user can still explicitly install them via
 @opindex no-installman
 @trindex install-man
 
-Here is how the documentation is handled in GNU @code{cpio} (which
-includes both Texinfo documentation and man pages):
+Here is how the man pages are handled in GNU @code{cpio} (which includes
+both Texinfo documentation and man pages):
 
 @example
-info_TEXINFOS = cpio.texi
 man_MANS = cpio.1 mt.1
 EXTRA_DIST = $(man_MANS)
 @end example
 
-Texinfo source and info pages are all considered to be source for the
-purposes of making a distribution.
-
 Man pages are not currently considered to be source, because it is not
-uncommon for man pages to be automatically generated.  For the same
-reason, they are not automatically included in the distribution.
+uncommon for man pages to be automatically generated.  Therefore they
+are not automatically included in the distribution.  However, this can
+be changed by use of the @samp{dist_} prefix.
+
+The @samp{nobase_} prefix is meaningless for man pages and is
+disallowed.
 
 
 @node Install, Clean, Documentation, Top

diff --git a/stamp-vti b/stamp-vti
index 101e467f855d9eac62a56de5ece3a214fc04cfb0..7f46fd08becb4b3767ccd4661e47b9f8a4be9dc5 100644 (file)
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 11 June 2001
+@set UPDATED 12 June 2001
 @set UPDATED-MONTH June 2001
 @set EDITION 1.4g
 @set VERSION 1.4g

diff --git a/version.texi b/version.texi
index 101e467f855d9eac62a56de5ece3a214fc04cfb0..7f46fd08becb4b3767ccd4661e47b9f8a4be9dc5 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 11 June 2001
+@set UPDATED 12 June 2001
 @set UPDATED-MONTH June 2001
 @set EDITION 1.4g
 @set VERSION 1.4g