Make "make links" work in fipscanisteronly builds.
authorDr. Stephen Henson <steve@openssl.org>
Tue, 22 Feb 2011 12:34:46 +0000 (12:34 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Tue, 22 Feb 2011 12:34:46 +0000 (12:34 +0000)
Makefile.fips
crypto/evp/Makefile

index 52aa542..245b592 100644 (file)
@@ -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)..." && \
index bae87dd..4b809c0 100644 (file)
@@ -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: