From 23e628961b44c0c3db613c5697493e2b94d9416f Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 10 Jan 1999 17:27:06 +0000 Subject: [PATCH] * automake.in (handle_texinfo): Prepend $(srcdir) to directory used to find texinfo.tex. Report from Glenn Amerine. --- ChangeLog | 5 +++++ automake.in | 16 +++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 75ef7ea9..a467c050 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1999-01-10 Tom Tromey + + * automake.in (handle_texinfo): Prepend $(srcdir) to directory + used to find texinfo.tex. Report from Glenn Amerine. + 1999-01-07 Tom Tromey Based on report from Marcus G. Daniels. Fixes include.test. diff --git a/automake.in b/automake.in index d8715563..278ba47c 100755 --- a/automake.in +++ b/automake.in @@ -2000,26 +2000,32 @@ sub handle_texinfo # Handle location of texinfo.tex. local ($need_texi_file) = 0; + local ($texinfo_tex); if ($cygnus_mode) { - &define_variable ('TEXINFO_TEX', - '$(top_srcdir)/../texinfo/texinfo.tex'); + $texinfo_tex = '$(top_srcdir)/../texinfo/texinfo.tex'; + &define_variable ('TEXINFO_TEX', $texinfo_tex); + } elsif ($config_aux_dir ne '.' && $config_aux_dir ne '') { - &define_variable ('TEXINFO_TEX', $config_aux_dir . '/texinfo.tex'); + $texinfo_tex = $config_aux_dir . '/texinfo.tex'; + &define_variable ('TEXINFO_TEX', $texinfo_tex); } elsif (&variable_defined ('TEXINFO_TEX')) { # The user defined TEXINFO_TEX so assume he knows what he is # doing. + $texinfo_tex = ('$(srcdir)/' + . &dirname (&variable_value ('TEXINFO_TEX'))); } else { + $texinfo_tex = '.'; $need_texi_file = 1; } - local ($xxform) = &dirname (&variable_value ('TEXINFO_TEX')); - $xxform =~ s/(\W)/\\$1/g; + local ($xxform); + ($xxform = $texinfo_tex) =~ s/(\W)/\\$1/g; $xform .= ' s/\@TEXINFODIR\@/' . $xxform . '/g;'; $output_rules .= &file_contents_with_transform ($xform, 'texinfos'); -- 2.43.5