From: Dr. Stephen Henson <steve@openssl.org>
Date: Mon, 19 Jan 2009 16:40:44 +0000 (+0000)
Subject: If not compiling for fips don't do anything in fips directory.
X-Git-Tag: OpenSSL_0_9_8k~54
X-Git-Url: https://git.openssl.org/gitweb/?a=commitdiff_plain;h=f82c1f0dd890a5c306d2405dcc7501a268c350df;p=openssl.git

If not compiling for fips don't do anything in fips directory.

Install fipscanister.o and friends from FIPSLIBDIR location.
---

diff --git a/Configure b/Configure
index d80c999f3b..2336707a29 100755
--- a/Configure
+++ b/Configure
@@ -1052,6 +1052,7 @@ foreach (sort (keys %disabled))
 	print "\n";
 	}
 
+push @skip, "fips" unless $fips;
 
 my $IsMK1MF=scalar grep /^$target$/,@MK1MF_Builds;
 
@@ -1447,6 +1448,7 @@ while (<IN>)
 			}
 		}
 	$sdirs = 0 unless /\\$/;
+        s/fips // if (/^DIRS=/ && !$fips);
 	s/^VERSION=.*/VERSION=$version/;
 	s/^MAJOR=.*/MAJOR=$major/;
 	s/^MINOR=.*/MINOR=$minor/;
diff --git a/fips/Makefile b/fips/Makefile
index 4e016b7b0e..383b313642 100644
--- a/fips/Makefile
+++ b/fips/Makefile
@@ -179,8 +179,8 @@ install:
 	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
 	done;
 	@target=install; $(RECURSIVE_MAKE)
-	@cp -p -f fipscanister.o fipscanister.o.sha1 fips_premain.c \
-		fips_premain.c.sha1 \
+	@cp -p -f $(FIPSLIBDIR)fipscanister.o $(FIPSLIBDIR)fipscanister.o.sha1 \
+		$(FIPSLIBDIR)fips_premain.c $(FIPSLIBDIR)fips_premain.c.sha1 \
 		$(INSTALL_PREFIX)$(INSTALLTOP)/lib/; \
 	chmod 0444 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/fips*