[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: `automake -a -c -f` wrongly updates the INSTALL file
From: |
Mike Frysinger |
Subject: |
Re: `automake -a -c -f` wrongly updates the INSTALL file |
Date: |
Wed, 2 Jan 2008 16:44:12 -0500 |
User-agent: |
KMail/1.9.7 |
On Thursday 28 September 2006, Mike Frysinger wrote:
> i normally use automake-1.9.6 but i just tried out 1.9b and it appears to
> have the same problem
automake-1.10 exhibits the problem as well ... finally spent some time digging
at it for fun
> $ svn st INSTALL
> $ automake-1.9b -a -c
> $ svn st INSTALL
> $ automake-1.9b -a -f
> $ svn st INSTALL
> $ automake-1.9b -a -c -f
> $ svn st INSTALL
> M INSTALL
> $ svn diff INSTALL
> ...
> -HOMEPAGE: http://freestdf.sourceforge.net/liblzw.php
> -AUTHOR: Mike Frysinger <address@hidden>
> +Installation Instructions
> +*************************
> ...
looks like the problem is in require_file_internal(). with all the
intertwined logic between add_missing/force_missing and found_it, the
found_it variable isnt checked in all the right places.
the following change fixes things for me, but i dont understand the
significance of the $suppress variable ... if $suppress needs to be 1 in the
case of ($found_it && -f "$libdir/$file"), then an "else" case can be added
or suppress can be moved up a line to something like:
$suppress = 1 if -f "$libdir/$file";
if (! $found_it && -f "$libdir/$file")
{
...
Signed-off-by: Mike Frysinger <address@hidden>
---
diff --git a/automake.in b/automake.in
index fbc97b0..c15c099 100755
--- a/automake.in
+++ b/automake.in
@@ -7225,7 +7225,7 @@ sub require_file_internal ($$$@)
my $message = "required file `$fullfile' not found";
if ($add_missing)
{
- if (-f "$libdir/$file")
+ if (! $found_it && -f "$libdir/$file")
{
$suppress = 1;
signature.asc
Description: This is a digitally signed message part.
- Re: `automake -a -c -f` wrongly updates the INSTALL file,
Mike Frysinger <=