Make "make links" work in fipscanisteronly builds.

diff --git a/Makefile.fips b/Makefile.fips
index 52aa542a46563f2db06caf8c4c62055117f3590e..245b5922dd456bc7f8c5bb6bb0c9a8b69cf713b3 100644 (file)
--- a/Makefile.fips
+++ b/Makefile.fips
@@ -522,8 +522,8 @@ files:
 links:
        @$(PERL) $(TOP)/util/mkdir-p.pl include/openssl
        @$(PERL) $(TOP)/util/mklink.pl include/openssl $(EXHEADER)
-       $(MAKE) -C fips links
-       SDIRS='$(LINKDIRS)' $(MAKE) -C crypto links
+       $(BUILDENV) $(MAKE) -C fips links
+       $(BUILDENV) SDIRS='$(LINKDIRS)' $(MAKE) -C crypto links
 
 gentests:
        @(cd test && echo "generating dummy tests (if needed)..." && \

diff --git a/crypto/evp/Makefile b/crypto/evp/Makefile
index bae87dd7555f1e5d7a66da1ddf9ef4574730480d..4b809c0c891e83aa0ef1064a595690deded2b179 100644 (file)
--- a/crypto/evp/Makefile
+++ b/crypto/evp/Makefile
@@ -65,7 +65,7 @@ files:
 links:
        @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
        @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-       cp $(TESTDATA) ../../test
+       [ ! -f $(TESTDATA) ] || cp $(TESTDATA) ../../test
        @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
 
 install: