From 2c1b2241019cf2cb9878884c0248a0a8af4fe9b5 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 24 May 2001 06:23:20 +0000 Subject: [PATCH] * automake.in (handle_texinfo_helper): Find mdate-sh in current directory in some situations. --- ChangeLog | 3 +++ automake.in | 14 +++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a461aeb4..e7ed35f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2001-05-24 Tom Tromey + * automake.in (handle_texinfo_helper): Find mdate-sh in current + directory in some situations. + * automake.in (generate_makefile): Better explanation for ansi2knr fix. diff --git a/automake.in b/automake.in index a86be0b4..d881ce58 100755 --- a/automake.in +++ b/automake.in @@ -2855,8 +2855,17 @@ sub handle_texinfo_helper my $vti = ($done ? $done : 'vti'); ++$done; - &require_conf_file_with_line ('info_TEXINFOS', $FOREIGN, - 'mdate-sh'); + # This is ugly, but it is our historical practice. + if ($config_aux_dir_set_in_configure_in) + { + &require_conf_file_with_line ('info_TEXINFOS', $FOREIGN, + 'mdate-sh'); + } + else + { + &require_file_with_line ('info_TEXINFOS', $FOREIGN, + 'mdate-sh'); + } my $conf_dir; if ($config_aux_dir_set_in_configure_in) @@ -2907,7 +2916,6 @@ sub handle_texinfo_helper { $texinfodir = '$(top_srcdir)/../texinfo'; &define_variable ('TEXINFO_TEX', "$texinfodir/texinfo.tex"); - } elsif ($config_aux_dir_set_in_configure_in) { -- 2.43.5