From e172caacaed6fbbc801971c617901590a96a4666 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 12 Feb 1996 08:09:16 +0000 Subject: [PATCH] Nothing --- ChangeLog | 2 ++ TODO | 5 ++++- automake.in | 18 +++++++++++------- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index d1c25d9a..5df9dd4e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ Sun Feb 11 15:55:15 1996 Tom Tromey + * 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 1eca2e62..067ee8d0 100644 --- 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 e809277f..c32ac228 100755 --- 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); -- 2.43.5