You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2007/08/24 13:01:06 UTC
svn commit: r569348 - /apr/apr/trunk/build/fixwin32mak.pl
Author: wrowe
Date: Fri Aug 24 04:01:06 2007
New Revision: 569348
URL: http://svn.apache.org/viewvc?rev=569348&view=rev
Log:
Forgot to consider cases where there is no RECURSE (but we still
have a somewhat bogusly constructed .mak file). Place the new
target string after INTDIR is declared.
Modified:
apr/apr/trunk/build/fixwin32mak.pl
Modified: apr/apr/trunk/build/fixwin32mak.pl
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/fixwin32mak.pl?rev=569348&r1=569347&r2=569348&view=diff
==============================================================================
--- apr/apr/trunk/build/fixwin32mak.pl (original)
+++ apr/apr/trunk/build/fixwin32mak.pl Fri Aug 24 04:01:06 2007
@@ -57,8 +57,8 @@
$srcfl = new IO::File $_, "r" || die;
$dstfl = new IO::File $tname, "w" || die;
while ($src = <$srcfl>) {
- if ($src =~ m|^(DS_POSTBUILD_DEP=.+)$|) {
- $postdepval = $1 . "\n\n";
+ if ($src =~ m|^DS_POSTBUILD_DEP=.+$|) {
+ $postdepval = $src;
}
if ($src =~ s|^ALL : \$\(DS_POSTBUILD_DEP\)||) {
$postdep = -1;
@@ -95,8 +95,9 @@
$srcfl = new IO::File $tname, "r" || die;
$dstfl = new IO::File $oname, "w" || die;
while ($src = <$srcfl>) {
- if ($src =~ m|^\!IF "\$\(RECURSE\)" == "0".*$|) {
- print $dstfl $postdepval;
+ if ($src =~ m|^INTDIR=|) {
+ print $dstfl $src;
+ $src = $postdepval;
}
$src =~ s|^(ALL : .+)$|$1 "\$\(DS_POSTBUILD_DEP\)"|;
print $dstfl $src;