Update ordinals

[openssl.git] / util / mkfiles.pl

diff --git a/util/mkfiles.pl b/util/mkfiles.pl
index 17b7d46957c4c505d92b4effd357738b171ecb29..a81434b2cf5d12006297761e7ff3c08e86d68816 100755 (executable)
--- a/util/mkfiles.pl
+++ b/util/mkfiles.pl
@@ -64,17 +64,6 @@ my @dirs = (
 "crypto/whrlpool",
 "crypto/ts",
 "crypto/srp",
-"fips",
-"fips/aes",
-"fips/des",
-"fips/dsa",
-"fips/dh",
-"fips/ecdsa",
-"fips/hmac",
-"fips/rand",
-"fips/rsa",
-"fips/utl",
-"fips/sha",
 "ssl",
 "apps",
 "engines",
@@ -108,7 +97,7 @@ while (<IN>)
        {
        chop;
        s/#.*//;
-       if (/^(\S+)\s*=\s*(.*)$/)
+       if (/^([^\s=]+)\s*=\s*(.*)$/)
                {
                $o="";
                ($s,$b)=($1,$2);
@@ -154,7 +143,7 @@ if ($dir eq "." && defined($sym{"BUILDENV"}))
 print "RELATIVE_DIRECTORY=\n";
 
 close (IN);
-if ($dir eq "." && $sym{CONFIGURE_ARGS} =~ /fipscanisteronly/)
+if ($dir eq "." && $sym{FIPSCANISTERONLY} eq "y")
        {
        $fipscanisteronly = 1;
        }