I write this to both lists (kde-devel,automake) to avoid problems because both developers try to fix the automake-1.6.1/KDE3 problem:
On Tue, 23 Apr 2002, Alexandre Duret-Lutz wrote: > >>> "Joerg" == Joerg Anders <[EMAIL PROTECTED]> writes: > > [...] > > Joerg> But what do you recommend to do? > > Just relax and wait for the next Automake release :) > -- > Alexandre Duret-Lutz > > + From [EMAIL PROTECTED] Wed Apr 24 07:58:00 2002 + Date: Tue, 23 Apr 2002 18:03:09 +0200 + From: David Faure <[EMAIL PROTECTED]> + Reply-To: [EMAIL PROTECTED] + To: [EMAIL PROTECTED] + Subject: Re: automake-1.6.1: I know exactly the error + Resent-Date: 23 Apr 2002 16:06:08 -0000 + Resent-From: [EMAIL PROTECTED] + Resent-cc: recipient list not shown: ; + + On Tuesday 23 April 2002 17:13, Joerg Anders wrote: + > + Unfortunately this fools Automake, as it recognizes its + > + Makefile.in's by checking whether the *first* line contains + > + 'generated by automake'. + + Duh. Both scripts use the same trick, but am_edit is more tolerant when it + comes to finding its own line..... + + I just committed this (after some hear-tearing because Alexandre's mail said + "generated by automake" instead of "generated automatically by automake"!) : + + Index: am_edit + =================================================================== + RCS file: /home/kde/kde-common/admin/am_edit,v + retrieving revision 1.314 + diff -u -p -r1.314 am_edit + --- am_edit 2002/04/17 16:13:10 1.314 + +++ am_edit 2002/04/23 16:01:27 + @@ -2085,8 +2085,15 @@ sub updateMakefile () + open (FILEOUT, "> $makefile") + || die "Could not create $makefile: $!\n"; + + - print FILEOUT "\# $progId - " . '$Revision: 1.313 $ ' . "\n"; + $MakefileData =~ s/\034/\\\n\t/g; # Restore continuation lines + + # Append our $progId line, _below_ the "generated by automake" line + + # because automake-1.6 relies on the first line to be his own. + + my $progIdLine = "\# $progId - " . '$Revision: 1.313 $ '."\n"; + + if ( !( $MakefileData =~ s/^(.*generated automatically by +automake.*\n)/$1$progIdLine/ ) ) { + + warn "automake line not found in $makefile\n"; + + # Fallback: first line + + print FILEOUT $progIdLine; + + }; + print FILEOUT $MakefileData; + close FILEOUT; + } + + -- + David FAURE, [EMAIL PROTECTED], [EMAIL PROTECTED] + http://people.mandrakesoft.com/~david/ + Contributing to: http://www.konqueror.org/, http://www.koffice.org/ + KDE, Making The Future of Computing Available Today + -- J.Anders, Chemnitz, GERMANY ([EMAIL PROTECTED])