From bfc6542016c35198a8f066765229d9fa6bbfa1d0 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 5 Aug 1997 23:33:30 +0000 Subject: [PATCH] better error message --- ChangeLog | 3 +++ automake.in | 22 ++++++++++------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4dc6fe1b..035fa813 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ Tue Aug 5 16:59:41 1997 Tom Tromey + * automake.in (require_file_internal): Better error message when + installing. + * automake.in (handle_texinfo): Smarter test when deleting output of makeinfo. diff --git a/automake.in b/automake.in index 27558fdc..039e680d 100755 --- a/automake.in +++ b/automake.in @@ -5522,7 +5522,7 @@ sub am_primary_prefixes # primary, so we explicitly allow it. && ! defined $configure_vars{$varname}) { - &am_line_error ($varname, "invalid variable \"$varname\""); + &am_line_error ($varname, "invalid variable \`$varname'"); } else { @@ -5787,6 +5787,7 @@ sub require_file_internal # Only install missing files according to our desired # strictness level. + local ($message) = "required file \`$errfile' not found"; if ($add_missing) { $suppress = 1; @@ -5796,29 +5797,29 @@ sub require_file_internal && grep ($_ eq $file, @libtoolize_files) && system ('libtoolize', '--automake')) { - $trailer = "; installing"; + $message = "installing \`$errfile'"; $suppress = 0; - $trailer .= "; cannot run \`libtoolize': $!"; + $trailer = "; cannot run \`libtoolize': $!"; } elsif (-f ($am_dir . '/' . $file)) { # Install the missing file. Symlink if we # can, copy if we must. Note: delete the file # first, in case it is a dangling symlink. - $trailer = "; installing"; + $message = "installing \`$errfile'"; unlink ($errfile); if ($symlink_exists) { if (! symlink ($am_dir . '/' . $file, $errfile)) { $suppress = 0; - $trailer .= "; error while making link: $!\n"; + $trailer = "; error while making link: $!\n"; } } elsif (! system ('cp', $am_dir . '/' . $file, $errfile)) { $suppress = 0; - $trailer .= "\n error while making link\n"; + $trailer = "\n error while making link\n"; } } } @@ -5827,15 +5828,12 @@ sub require_file_internal if ($is_configure) { # FIXME: allow actual file to be specified. - &am_conf_line_error - ('configure.in', $line, - "required file \"$errfile\" not found$trailer"); + &am_conf_line_error ('configure.in', $line, + "$message$trailer"); } else { - &am_line_error - ($line, - "required file \"$errfile\" not found$trailer"); + &am_line_error ($line, "$message$trailer"); } $exit_status = $save if $suppress; } -- 2.43.5