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

git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.2.x@569349 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 5 insertions, 4 deletions

diff --git a/build/fixwin32mak.pl b/build/fixwin32mak.pl
index 6fbe36e9c..2c7b7d2a2 100644
--- a/build/fixwin32mak.pl
+++ b/build/fixwin32mak.pl
@@ -57,8 +57,8 @@ sub fixcwd {
         $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 @@ sub fixcwd {
                 $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;