X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util%2Fmkfiles.pl;h=268acadb6292261936a6730fcc1fb956cc7996ed;hb=03b672deca60ab1fb272f1a1e206769da969bc9a;hp=1c8493ae2209cfa91a2767fb303ed368a119f068;hpb=befcced53ebbd561de96c83020d625721670d40b;p=oweals%2Fopenssl.git

diff --git a/util/mkfiles.pl b/util/mkfiles.pl
index 1c8493ae22..268acadb62 100755
--- a/util/mkfiles.pl
+++ b/util/mkfiles.pl
@@ -58,24 +58,11 @@ my @dirs = (
 "crypto/engine",
 "crypto/ocsp",
 "crypto/ui",
-"crypto/krb5",
 #"crypto/store",
 "crypto/pqueue",
 "crypto/whrlpool",
 "crypto/ts",
 "crypto/srp",
-"fips",
-"fips/aes",
-"fips/cmac",
-"fips/des",
-"fips/dsa",
-"fips/dh",
-"fips/ecdsa",
-"fips/hmac",
-"fips/rand",
-"fips/rsa",
-"fips/utl",
-"fips/sha",
 "ssl",
 "apps",
 "engines",
@@ -109,7 +96,7 @@ while (<IN>)
 	{
 	chop;
 	s/#.*//;
-	if (/^(\S+)\s*=\s*(.*)$/)
+	if (/^([^\s=]+)\s*=\s*(.*)$/)
 		{
 		$o="";
 		($s,$b)=($1,$2);
@@ -155,7 +142,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;
 	}