2006-03-30  Stepan Kasal  <address@hidden>

	* automake.in (handle_texinfo_helper): Rephrase Akim's suggestion.

Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1619
diff -u -r1.1619 automake.in
--- automake.in	23 Mar 2006 06:35:15 -0000	1.1619
+++ automake.in	30 Mar 2006 17:07:05 -0000
@@ -3090,25 +3090,23 @@
       #   be a waste of space to distribute them.  It's not clear
       #   which syntax we should use to indicate that .info files should
       #   not be distributed.  Akim Demaille suggested that eventually
-      #   we switch to a new syntax:
-      #   |  Maybe we should take some inspiration from what's already
-      #   |  done in the rest of Automake.  Maybe there is too much
-      #   |  syntactic sugar here, and you want
-      #   |     nodist_INFO = bar.info
-      #   |     dist_bar_info_SOURCES = bar.texi
-      #   |     bar_texi_DEPENDENCIES = foo.texi
-      #   |  with a bit of magic to have bar.info represent the whole
-      #   |  bar*info set.  That's a lot more verbose that the current
-      #   |  situation, but it is # not new, hence the user has less
-      #   |  to learn.
-      #	  |
-      #   |  But there is still too much room for meaningless specs:
-      #   |     nodist_INFO = bar.info
-      #   |     dist_bar_info_SOURCES = bar.texi
-      #   |     dist_PS = bar.ps something-written-by-hand.ps
-      #   |     nodist_bar_ps_SOURCES = bar.texi
-      #   |     bar_texi_DEPENDENCIES = foo.texi
-      #   |  here bar.texi is dist_ in line 2, and nodist_ in 4.
+      #   we switch to a new syntax (edited by Stepan Kasal):
+      #   |  We should introduce a new primary, INFOS, and use the standard
+      #   |  SOURCES mechanism to declare the sources:
+      #   |    info_INFOS = bar.info
+      #   |    bar_info_SOURCES = bar.texi gpl.texi
+      #   |  According to a general rule, files from bar_info_SOURCES are distributed,
+      #   |  but one can use nodist_bar_info_SOURCES for generated texinfo files.
+      #   |
+      #   |  Another example:
+      #   |    nodist_info_INFOS = bar.info
+      #   |  (bar_info_SOURCES defaults to "bar.texi".)
+      #   |
+      #   |  To declare an html manual, one would use:
+      #   |    html_HTMLS = bar.html
+      #   |    bar_html_SOURCES = $(bar_info_SOURCES)
+      #   |
+      #   |  By default, INFOS would be installed and HTMLS not installed.
       #
       # Back to the point, it should be clear that in order to support
       # non-distributed .info files, we need to build them in the