From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 23 May 2012 00:39:01 +0000 (+0000)
Subject: Don't install fips_standalone_sha1.exe if it isn't being built
X-Git-Tag: OpenSSL-fips-2_0-pl1~25
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b75ff26d7b34c2ed335e2feb47e8f5ed4a4840c4;p=oweals%2Fopenssl.git

Don't install fips_standalone_sha1.exe if it isn't being built
---

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 70b176c872..e2e9ffd086 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -576,9 +576,14 @@ if ($fipscanisteronly)
 	\$(CP) \"fips${o}fips_premain.c.sha1\" \"\$(INSTALLTOP)${o}lib\"
 	\$(CP) \"\$(INCO_D)${o}fips.h\" \"\$(INSTALLTOP)${o}include${o}openssl\"
 	\$(CP) \"\$(INCO_D)${o}fips_rand.h\" \"\$(INSTALLTOP)${o}include${o}openssl\"
-	\$(CP) "\$(BIN_D)${o}fips_standalone_sha1$exep" \"\$(INSTALLTOP)${o}bin\"
 	\$(CP) \"util${o}fipslink.pl\" \"\$(INSTALLTOP)${o}bin\"
 EOF
+	if ($fips_sha1_exe_build)
+		{
+		$extra_install .= <<"EOF";
+	\$(CP) "\$(BIN_D)${o}fips_standalone_sha1$exep" \"\$(INSTALLTOP)${o}bin\"
+EOF
+		}
 	}
 elsif ($shlib)
 	{