Nothing

diff --git a/ChangeLog b/ChangeLog
index d1c25d9a9606239f0721f94a2345bf2d5d00a96c..5df9dd4ea89223c1595a653b46c77d176136c710 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 Sun Feb 11 15:55:15 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
+       * automake.in (handle_texinfo): Removed bogus error message.
+
        * automake.in (handle_texinfo): Push $(INFO_DEPS), not 'info',
        onto @all.
        (handle_options): Handle version number.

diff --git a/TODO b/TODO
index 1eca2e6216fd0a3fbd2d68eb0f4963757655e7db..067ee8d096466ace2f9fbed5e9856c57d02c80fa 100644 (file)
--- a/TODO
+++ b/TODO
@@ -18,7 +18,10 @@ Use recode in dist target when MAIN_CHARSET specified.  Read caveats
 in automake.in before doing this.  Note the same problem used to apply
 to the no-dependencies option; maybe it still should?  Note also that
 each Makefile.am must be rewritten at "make dist" time if
-MAINT_CHARSET and DIST_CHARSET are not identical.
+MAINT_CHARSET and DIST_CHARSET are not identical.  NOTE: gettext must
+arrange for all .po files not to be recoded.  In the long term this
+might be a problem (consider when some systems use Unicode but the
+rest do not)
 
 Handle dist-zoo and dist-zip.  Generally add more DOS support.  Maybe
 run "doschk" (why isn't this merged with "pathchk"?) when doing a

diff --git a/automake.in b/automake.in
index e809277f37536969836afa0b48be0933cde0fda4..c32ac228f1b55d283439e25de1a85661e7c6fc8c 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -642,20 +642,24 @@ sub grep_for_vers_texi
     return '';
 }
 
+# Do work of building, etc, Texinfo.  Works for either info or html,
+# depending on first argument.
+sub texinfo_worker
+{
+    local ($dest) = @_;
+}
+
 # Handle all Texinfo source.
-# Anyplace marked FIXME in this code is for multi-texi changes.
 sub handle_texinfo
 {
+    # FIXME can this really be right?  Might want to have configure
+    # determine list of texinfos.  Fix this when someone complains.
     &am_error ("\`TEXINFOS' is an anachronism; use \`info_TEXINFOS'")
        if defined $contents{'TEXINFOS'};
-    return if ! defined $contents{'info_TEXINFOS'};
+    return if (! defined $contents{'info_TEXINFOS'}
+              && ! defined $contents{'html_TEXINFOS'});
 
     local (@texis) = split (/\s+/, $contents{'info_TEXINFOS'});
-    if (@texis > 1)
-    {
-       &am_error ('sorry, only one file allowed in `info_TEXINFOS\'');
-       return;
-    }
 
     local (@infos_list, @info_deps_list, @dvis_list, @texi_deps);
     local ($infobase, $info_cursor);