2005-12-31  Stepan Kasal  <address@hidden>

	* automake.in (handle_texinfo_helper): Declare that info files
	won't be distributed by default in future versions.
	(output_texinfo_build_rules): Mention this, too.
	(libtool_new_api): Fix a typo in the comment.

Index: automake.in
===================================================================
RCS file: /cvsroot/automake/automake/automake.in,v
retrieving revision 1.1613
diff -u -p -r1.1613 automake.in
--- automake.in	3 Oct 2005 20:52:27 -0000	1.1613
+++ automake.in	31 Dec 2005 15:00:04 -0000
@@ -353,7 +353,7 @@ my $ac_gettext_location;
 # Lists of tags supported by Libtool.
 my %libtool_tags = ();
 # 1 if Libtool uses LT_SUPPORTED_TAG.  If it does, then it also
-# use AC_REQUIRE_AUX_FILE.
+# uses AC_REQUIRE_AUX_FILE.
 my $libtool_new_api = 0;
 
 # Most important AC_CANONICAL_* macro seen so far.
@@ -2928,8 +2928,8 @@ sub output_texinfo_build_rules ($$$@)
   # different in each case.  However we cannot output two different
   # set of generic rules.  Because in-source builds are more usual, we
   # use generic rules in this case and fall back to "specific" rules
-  # for build-dir builds.  (It should not be a problem to invert this
-  # if needed.)
+  # for build-dir builds.  (This will be inverted in future versions
+  # of Automake, which won't distribute info files by default.)
   $generic = 0 unless $insrc;
 
   # We cannot use a suffix rule to build info files with an empty
@@ -3124,6 +3124,11 @@ sub handle_texinfo_helper ($)
       #   # Do not create info files for distribution.
       #   dist-info:
       # in order not to distribute .info files.
+      #
+      # Future versions of Automake will not distribute the info files by
+      # default.  (To install the info file, one needs the install-info
+      # program from Texinfo anyway.)
+      #
       my $insrc = ($out_file =~ $user_cleaned_files) ? 0 : 1;
 
       my $soutdir = '$(srcdir)/' . $outdir;