From cbb048ee4cf705439cc9a9cb51bce0a85b2d066e Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 19 Mar 2000 21:04:46 +0000 Subject: [PATCH] Fix for PR automake/41: * automake.in (require_file_found): New global. (require_file_internal): Set require_file_found entry. (handle_texinfo): Require file any number of times. --- ChangeLog | 5 +++++ automake.in | 16 ++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3df9473d..02737518 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2000-03-19 Tom Tromey + Fix for PR automake/41: + * automake.in (require_file_found): New global. + (require_file_internal): Set require_file_found entry. + (handle_texinfo): Require file any number of times. + * automake.in (handle_dist_worker): Exit if `cp' fails. Fixes install2.test. diff --git a/automake.in b/automake.in index cbd46f44..72768547 100755 --- a/automake.in +++ b/automake.in @@ -2227,14 +2227,13 @@ sub handle_texinfo # actual names don't matter much. We only number starting # with the second one, so that the common case looks nice. $vti = ($done ? $done : 'vti'); + ++$done; + &push_dist_common ($vtexi, 'stamp-' . $vti); push (@clean, $vti); - # Only require once. &require_conf_file_with_line ('info_TEXINFOS', $FOREIGN, - 'mdate-sh') - if ! $done; - ++$done; + 'mdate-sh'); local ($conf_pat, $conf_dir); if ($config_aux_dir eq '.' || $config_aux_dir eq '') @@ -7405,6 +7404,11 @@ sub is_make_dir # This variable is local to the "require file" set of functions. @require_file_paths = (); +# If a file name appears as a key in this hash, then it has already +# been checked for. This variable is local to the "require file" +# functions. +%require_file_found = (); + # See if we want to push this file onto dist_common. This function # encodes the rules for deciding when to do so. sub maybe_push_required_file @@ -7440,6 +7444,10 @@ sub require_file_internal foreach $file (@files) { + # If we've already looked for it, we're done. + next if defined $require_file_found{$file}; + $require_file_found{$file} = 1; + $found_it = 0; foreach $dir (@require_file_paths) { -- 2.43.5