apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r569349 - /apr/apr/branches/1.2.x/build/fixwin32mak.pl
Date Fri, 24 Aug 2007 11:01:49 GMT
Author: wrowe
Date: Fri Aug 24 04:01:49 2007
New Revision: 569349

URL: http://svn.apache.org/viewvc?rev=569349&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.

Backport: r569348

Modified:
    apr/apr/branches/1.2.x/build/fixwin32mak.pl

Modified: apr/apr/branches/1.2.x/build/fixwin32mak.pl
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/build/fixwin32mak.pl?rev=569349&r1=569348&r2=569349&view=diff
==============================================================================
--- apr/apr/branches/1.2.x/build/fixwin32mak.pl (original)
+++ apr/apr/branches/1.2.x/build/fixwin32mak.pl Fri Aug 24 04:01:49 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;



Mime
View raw message