From 84d10a1c73909b0376cb1c4fa122ae2c05ff9eb8 Mon Sep 17 00:00:00 2001
From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Mon, 17 Apr 2006 12:14:07 +0000
Subject: [PATCH] * lib/Autom4te/FileUtils.pm (find_file): Fix a typo in the
 description; eliminate the duplicate error message. * doc/automake.texi
 (@direntry): `Invoking Automake' is the name of the usage node for `automake'
 * lib/Automake/Variable.pm (%_gen_varname): Fix typos in the comment.

---
 ChangeLog                 |  9 +++++++++
 doc/automake.texi         |  2 +-
 doc/stamp-vti             |  2 +-
 doc/version.texi          |  2 +-
 lib/Automake/FileUtils.pm | 21 ++++++++-------------
 lib/Automake/Variable.pm  |  4 ++--
 6 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2ca3251b0..a47e221d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-04-17  Stepan Kasal  <kasal@ucw.cz>
+
+	* lib/Autom4te/FileUtils.pm (find_file): Fix a typo in the
+	description; eliminate the duplicate error message.
+	* doc/automake.texi (@direntry): `Invoking Automake' is the name
+	of the usage node for `automake'
+	* lib/Automake/Variable.pm (%_gen_varname): Fix typos in the
+	comment.
+
 2006-04-17  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* m4/lispdir.m4 (AM_PATH_LISPDIR): Require Autoconf 2.59c,
diff --git a/doc/automake.texi b/doc/automake.texi
index 5c00018f4..b8821beaa 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -43,7 +43,7 @@ published by the Free Software Foundation raise funds for
 @dircategory Individual utilities
 @direntry
 * aclocal: (automake)Invoking aclocal.          Generating aclocal.m4.
-* automake: (automake)Invoking automake.        Generating Makefile.in.
+* automake: (automake)Invoking Automake.        Generating Makefile.in.
 @end direntry
 
 @titlepage
diff --git a/doc/stamp-vti b/doc/stamp-vti
index 73fcf7acf..b0e56d43d 100644
--- a/doc/stamp-vti
+++ b/doc/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 9 April 2006
+@set UPDATED 17 April 2006
 @set UPDATED-MONTH April 2006
 @set EDITION 1.9a
 @set VERSION 1.9a
diff --git a/doc/version.texi b/doc/version.texi
index 73fcf7acf..b0e56d43d 100644
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 9 April 2006
+@set UPDATED 17 April 2006
 @set UPDATED-MONTH April 2006
 @set EDITION 1.9a
 @set VERSION 1.9a
diff --git a/lib/Automake/FileUtils.pm b/lib/Automake/FileUtils.pm
index 470249cd0..3524dd409 100644
--- a/lib/Automake/FileUtils.pm
+++ b/lib/Automake/FileUtils.pm
@@ -52,8 +52,8 @@ use vars qw (@ISA @EXPORT);
 Return the first path for a C<$file_name> in the C<include>s.
 
 We match exactly the behavior of GNU M4: first look in the current
-directory (which includes the case of absolute file names), and, if
-the file is not absolute, just fail.  Otherwise, look in C<@include>.
+directory (which includes the case of absolute file names), and then,
+if the file name is not absolute, look in C<@include>.
 
 If the file is flagged as optional (ends with C<?>), then return undef
 if absent, otherwise exit with error.
@@ -76,22 +76,17 @@ sub find_file ($@)
   return File::Spec->canonpath ($file_name)
     if -e $file_name;
 
-  if (File::Spec->file_name_is_absolute ($file_name))
+  if (!File::Spec->file_name_is_absolute ($file_name))
     {
-      fatal "$file_name: no such file or directory"
-	unless $optional;
-      return undef;
-    }
-
-  foreach my $path (@include)
-    {
-      return File::Spec->canonpath (File::Spec->catfile ($path, $file_name))
-	if -e File::Spec->catfile ($path, $file_name)
+      foreach my $path (@include)
+	{
+	  return File::Spec->canonpath (File::Spec->catfile ($path, $file_name))
+	    if -e File::Spec->catfile ($path, $file_name)
+	}
     }
 
   fatal "$file_name: no such file or directory"
     unless $optional;
-
   return undef;
 }
 
diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm
index 1f89c5fe1..96e405e59 100644
--- a/lib/Automake/Variable.pm
+++ b/lib/Automake/Variable.pm
@@ -137,8 +137,8 @@ my $_VARIABLE_PATTERN = '^[.A-Za-z0-9_@]+' . "\$";
 my @_var_order;
 
 # This keeps track of all variables defined by &_gen_varname.
-# $_gen_varname{$base} is a hash for all variable defined with
-# prefix `$base'.  Values stored this this hash are the variable names.
+# $_gen_varname{$base} is a hash for all variables defined with
+# prefix `$base'.  Values stored in this hash are the variable names.
 # Keys have the form "(COND1)VAL1(COND2)VAL2..." where VAL1 and VAL2
 # are the values of the variable for condition COND1 and COND2.
 my %_gen_varname = ();
-- 
2.11.4.GIT