Remove references to deleted fips directory from Makefile.org

[openssl.git] / util / mkfiles.pl

diff --git a/util/mkfiles.pl b/util/mkfiles.pl
index 66b78f417dd72d5355fc16de33e541893b96da34..42db4666887c7f35ac5f80527ea817f1b185fe16 100755 (executable)
--- a/util/mkfiles.pl
+++ b/util/mkfiles.pl
@@ -63,11 +63,14 @@ my @dirs = (
 "crypto/pqueue",
 "crypto/whrlpool",
 "crypto/ts",
+"crypto/srp",
 "fips",
 "fips/aes",
+"fips/cmac",
 "fips/des",
 "fips/dsa",
 "fips/dh",
+"fips/ecdh",
 "fips/ecdsa",
 "fips/hmac",
 "fips/rand",
@@ -107,7 +110,7 @@ while (<IN>)
        {
        chop;
        s/#.*//;
-       if (/^(\S+)\s*=\s*(.*)$/)
+       if (/^([^\s=]+)\s*=\s*(.*)$/)
                {
                $o="";
                ($s,$b)=($1,$2);
@@ -153,7 +156,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;
        }