When copying and renaming files, put quotes around the sources and

destinations.

svn path=/trunk/; revision=25957

diff --git a/packaging/portableapps/win32/makenmake.pl b/packaging/portableapps/win32/makenmake.pl
index 407f976c3e7f58854c60b4d62a56fd605d3c742a..49cec6b0f1246acf9cee374efd50ecdda8543152 100644 (file)
--- a/packaging/portableapps/win32/makenmake.pl
+++ b/packaging/portableapps/win32/makenmake.pl
@@ -64,14 +64,14 @@ while($line = <>) {
 
        $oname = "";
 
-       print "\t\$(COPY) $file \$(FILES)\\\$(APP)\\\$(WIRESHARK)$dir \$(COPY_FLAGS)\n";
+       print "\t\$(COPY) \"$file\" \"\$(FILES)\\\$(APP)\\\$(WIRESHARK)$dir\" \$(COPY_FLAGS)\n";
 
        if($line =~ /oname=(\S+)/) { # override this filename
            $oname = $1;
            $file =~ /\\(.*)$/;
            $name = $1;
 
-           print "\t\$(MOVE) \$(FILES)\\\$(APP)\\\$(WIRESHARK)\\$dir\\$name \$(FILES)\\\$(APP)\\\$(WIRESHARK)\\$dir\\$oname\n";
+           print "\t\$(MOVE) \"\$(FILES)\\\$(APP)\\\$(WIRESHARK)\\$dir\\$name\" \"\$(FILES)\\\$(APP)\\\$(WIRESHARK)\\$dir\\$oname\"\n";
 
        }
 

diff --git a/packaging/u3/win32/makenmake.pl b/packaging/u3/win32/makenmake.pl
index 60796ae9ac33cc336175cd9a06a57fd83e093887..781c878a8b96c1b06fb0ac6c59c318f98c335fc2 100644 (file)
--- a/packaging/u3/win32/makenmake.pl
+++ b/packaging/u3/win32/makenmake.pl
@@ -75,14 +75,14 @@ while($line = <>) {
            $u3fileloc = "\$(" . uc $1 . ")";
        }
 
-       print "\t\$(COPY) $file $u3fileloc$dir \$(COPY_FLAGS)\n";
+       print "\t\$(COPY) \"$file\" \"$u3fileloc$dir\" \$(COPY_FLAGS)\n";
 
        if($line =~ /oname=(\S+)/) { # override this filename
            $oname = $1;
            $file =~ /\\(.*)$/;
            $name = $1;
 
-           print "\t\$(MOVE) $u3fileloc$dir\\$name $u3fileloc$dir\\$oname\n";
+           print "\t\$(MOVE) \"$u3fileloc$dir\\$name\" \"$u3fileloc$dir\\$oname\"\n";
 
        }