resolve conflicts

1 files changed, 9 insertions, 1 deletions

diff --git a/src/lib/libcrypto/util/mkfiles.pl b/src/lib/libcrypto/util/mkfiles.pl
index 29e1404c69..928a274303 100644
--- a/src/lib/libcrypto/util/mkfiles.pl
+++ b/src/lib/libcrypto/util/mkfiles.pl
@@ -51,6 +51,14 @@ my @dirs = (
 "crypto/ocsp",
 "crypto/ui",
 "crypto/krb5",
+"fips",
+"fips/aes",
+"fips/des",
+"fips/dsa",
+"fips/dh",
+"fips/rand",
+"fips/rsa",
+"fips/sha1",
 "ssl",
 "apps",
 "test",
@@ -58,7 +66,7 @@ my @dirs = (
 );
 
 foreach (@dirs) {
-        &files_dir ($_, "Makefile.ssl");
+        &files_dir ($_, "Makefile");
 }
 
 exit(0);