Remove generation of ms/version32.rc from Configure, use util/mkrc.pl

[openssl.git] / util / mkfiles.pl

diff --git a/util/mkfiles.pl b/util/mkfiles.pl
index d668316d697de59ca5cf6de8c093700edfb6693c..0e4f71e04dcadc5a71f8325dc18ce301d0a758ff 100755 (executable)
--- a/util/mkfiles.pl
+++ b/util/mkfiles.pl
@@ -48,7 +48,6 @@ my @dirs = (
 "crypto/x509v3",
 "crypto/cms",
 "crypto/conf",
-"crypto/jpake",
 "crypto/txt_db",
 "crypto/pkcs7",
 "crypto/pkcs12",
@@ -64,6 +63,7 @@ my @dirs = (
 "crypto/async",
 "crypto/chacha",
 "crypto/poly1305",
+"crypto/blake2",
 "crypto/kdf",
 "ssl",
 "apps",
@@ -95,7 +95,7 @@ my $s="";
 
 while (<IN>)
        {
-       chop;
+       s|\R$||;
        s/#.*//;
        if (/^([^\s=]+)\s*=\s*(.*)$/)
                {
@@ -105,10 +105,10 @@ while (<IN>)
                        {
                        if ($b =~ /\\$/)
                                {
-                               chop($b);
+                               $b=$`;
                                $o.=$b." ";
-                               $b=<IN>;
-                               chop($b);
+                               $b = "" unless defined($b = <IN>);
+                               $b =~ s{\R$}{};
                                }
                        else
                                {