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 d80c999f3b36fa89daa8f1dad8c569bfad7369c8..2336707a299f8912a8f4ab31826c8303e0844e0a 100755 (executable)
--- 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 4e016b7b0ea977a7f32e0de606545c8539c0ea2f..383b313642a4abcaf510e0f39276e7b037f20aa4 100644 (file)
--- 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*