Correct the path syntax for link /out: and the manifest's

InputFile specification

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

1 files changed, 7 insertions, 4 deletions

diff --git a/build/cvtdsp.pl b/build/cvtdsp.pl
index adc7632f5..3a21eb7cd 100644
--- a/build/cvtdsp.pl
+++ b/build/cvtdsp.pl
@@ -39,6 +39,7 @@ else {
     print "Specify -w3 or -w4 for .dsp build with warning level 3 or 4 (strict)\n\n";
     print "Specify -ia64 for build targeted at Itanium (req's psdk tools)\n\n";
     print "Specify -p for extreme pool debugging\n\n";
+    print "Specify -mt to add .manifest embedding\n\n";
     die "Missing argument";
 }
 
@@ -62,11 +63,13 @@ sub addmt {
                 $outdir = $1;
                 $outpath = $oname;
                 $outpath =~ s|\.dsp||;
-                $outpath =  "./" . $outdir . "/" . $outpath . $outtype;
+                $outpath =  ".\\" . $outdir . "\\" . $outpath . $outtype;
 	    }
-	    if ($src =~ m|^# ADD LINK32 .+ /out:"([^"]+)"|) {
-                $outpath = $1;
-                $outpath = "./" . $outpath if (!($outpath =~ m|^\.|));
+	    if ($src =~ m|^# ADD (BASE )?LINK32 .+ /out:"([^"]+)"|) {
+	        $outpath = $2;
+                $outpath =~ s|/|\\|;
+                $outpath = ".\\" . $outpath if (!($outpath =~ m|^\.|));
+                $src =~ s|/out:"([^"]+)"|/out:"$outpath"|;
 	    }
 	    if (defined($outpath) && ($src =~ m|^# Begin Special Build Tool|)) {
                 undef $outpath;