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 4fbe29ac755aa84e210209507020ec1ed252721e..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",
@@ -107,8 +107,8 @@ while (<IN>)
                                {
                                $b=$`;
                                $o.=$b." ";
-                               $b=<IN>;
-                               $b =~ s|\R$||;
+                               $b = "" unless defined($b = <IN>);
+                               $b =~ s{\R$}{};
                                }
                        else
                                {