Remove debugging print.

Explicitly use LINKDIRS for fipsdist links.

diff --git a/Configure b/Configure
index b429f78c39b205bd724356fc927708b968263dcc..02205d14fab246500df9678fee75cc7a42771184 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -1126,7 +1126,6 @@ my $exp_cflags = "";
 
 if ($fipscanisteronly == 2)
        {
 
 if ($fipscanisteronly == 2)
        {

-print STDERR "ADDING FIPSSYM\n";

        $exp_cflags .= " -DOPENSSL_FIPSSYMS";
        }
 
        $exp_cflags .= " -DOPENSSL_FIPSSYMS";
        }
 

diff --git a/Makefile.fips b/Makefile.fips
index 198e6a5a1b07f1292418af5682d7f5fd2985a4b7..3bfcf188a2e0ab5fd967cb935e21f036a07988b0 100644 (file)
--- a/Makefile.fips
+++ b/Makefile.fips
@@ -521,7 +521,7 @@ links:
        @$(PERL) $(TOP)/util/mkdir-p.pl include/openssl
        @$(PERL) $(TOP)/util/mklink.pl include/openssl $(EXHEADER)
        @set -e; dir=fips target=links; $(RECURSIVE_BUILD_CMD)
        @$(PERL) $(TOP)/util/mkdir-p.pl include/openssl
        @$(PERL) $(TOP)/util/mklink.pl include/openssl $(EXHEADER)
        @set -e; dir=fips target=links; $(RECURSIVE_BUILD_CMD)

-       @set -e; dir=crypto target=links; $(RECURSIVE_BUILD_CMD)
+       @(cd crypto ; SDIRS='$(LINKDIRS)' $(MAKE) -e links)

 
 gentests:
        @(cd test && echo "generating dummy tests (if needed)..." && \
 
 gentests:
        @(cd test && echo "generating dummy tests (if needed)..." && \