Re: automake-1.6.1: both developers try their fixes

[David Faure]

On Wednesday 24 April 2002 22:11, Alexandre Duret-Lutz wrote:
> >>> "Joerg" == Joerg Anders <address@hidden> writes:
> 
> [...]
> 
>  Joerg> + From address@hidden Wed Apr 24 07:58:00 2002
> [...]
>  Joerg> + > + Unfortunately this fools Automake, as it recognizes its
>  Joerg> + > + Makefile.in's by checking whether the *first* line contains
>  Joerg> + > + 'generated by automake'.
>  Joerg> +
>  Joerg> + Duh. Both scripts use the same trick, but am_edit is more tolerant 
>  Joerg> + when it comes to finding its own line.....
>  Joerg> +
>  Joerg> + I just committed this (after some hear-tearing because Alexandre's 
>  Joerg> + mail said "generated by automake" instead of "generated 
>  Joerg> + automatically by automake"!) :
> 
> That's really what I meant, I'm afraid.
> 
>   Automake <= 1.5: 
>       output 'generated automatically by automake' but don't grep for it
> 
>   Automake 1.6 and 1.6.1: 
>       output 'generated by automake' and grep for it in the *first* line
> 
>   CVS Automake (future versions):
>       output 'generated by automake' and grep for it in the whole file  
> 
> (Don't ask me why the wording changed, I don't know.)

Yeah, why make life simple when you can make it complex, heh? ;)

> [...]
> 
>  Joerg> + +    if ( !( $MakefileData =~ s/^(.*generated automatically by 
> automake.*\n)/$1$progIdLine/ ) ) {
> 
> hence I suggest something like  /^(.*generated .*by automake.*\n)/

Ok, done.

-- 
David FAURE, address@hidden, address@hidden
http://people.mandrakesoft.com/~david/
Contributing to: http://www.konqueror.org/, http://www.koffice.org/
KDE, Making The Future of Computing Available Today