forked from Imagelibrary/rtems
Patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>:
The patch below fixes a nasty bug in acpolish, which has broken many
Makefile.ins below c/src/tests/
APPLYING THE PATCH:
patch -p1 < rtems-rc-19990709-5.diff
The essential part of this patch is the diff-fragment for acpolish
contained in this patch. Ie. if any of the other diffs do not apply,
make sure that the acpolish diff was applied correctly and then run
cd <srcdir>
tools/update/rtems-polish.sh -ac
This commit is contained in:
@@ -251,8 +251,14 @@ sub subst_line
|
||||
{
|
||||
push @installdirs, "$1" ;
|
||||
}
|
||||
elsif ( /^.*\$\(INSTALL_CHANGE\).*\s([^\s]+)(\/[^\.\s]+\.[^\s\/]+)$/o )
|
||||
{
|
||||
# print STDERR "WARNING - DIR1: $1 <$2> " ;
|
||||
push @installdirs, "$1" ;
|
||||
}
|
||||
elsif ( /^.*\$\(INSTALL_CHANGE\).*\s([^\s]+)$/o )
|
||||
{
|
||||
# print STDERR "DIR2 $1\n" ;
|
||||
push @installdirs, "$1" ;
|
||||
}
|
||||
}
|
||||
@@ -441,6 +447,11 @@ sub subst_line
|
||||
# Most of them are removed, but we still have some :-
|
||||
push @tbuf, "$1 $2\n" ;
|
||||
}
|
||||
elsif ( /^\@.*_(TRUE|FALSE)\@.*$/o )
|
||||
{ # automake conditionals
|
||||
# HACK: Don't know how to handle them, so let's pass them through
|
||||
push @tbuf, "$_" ;
|
||||
}
|
||||
elsif ( /^[\s]*([^:]+)[\s]*(:[:]*)[\s]*(.*)$/o )
|
||||
{
|
||||
if ( "$2" eq "::" )
|
||||
@@ -482,6 +493,20 @@ sub subst_line
|
||||
}
|
||||
}
|
||||
@buffer = @tbuf ;
|
||||
@tbuf = @installdirs ;
|
||||
@installdirs = () ;
|
||||
foreach ( @tbuf )
|
||||
{
|
||||
if ( /^([^\s]+)(\/[^\.\s]+\.[^\s\/]+)$/o )
|
||||
{
|
||||
print STDERR "WARNING - stripping of file: $1 <$2> " if ( $verbose > 1 );
|
||||
push @installdirs, "$1" ;
|
||||
}
|
||||
else
|
||||
{
|
||||
push @installdirs, "$_" ;
|
||||
}
|
||||
}
|
||||
purge \@installdirs ;
|
||||
purge \@pieces ;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user