Test data files should not be part of the TEST value, or util/mk1mf.pl

gets confused...  The separate TESTDATA variable was inspired from
crypto/evp/Makefile.ssl.

diff --git a/fips/aes/Makefile.ssl b/fips/aes/Makefile.ssl
index 3ce47af76a778e73efe0e1063fb169b4dcfb7d53..b199f754fe0eafb891998725c3075796c789bd09 100644 (file)
--- a/fips/aes/Makefile.ssl
+++ b/fips/aes/Makefile.ssl
@@ -19,7 +19,8 @@ AR=           ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
-TEST=fips_aesavs.c fips_aes_data
+TEST=fips_aesavs.c
+TESTDATA=fips_aes_data
 APPS=
 
 LIB=$(TOP)/libcrypto.a
@@ -53,6 +54,7 @@ links:
        @$(TOP)/util/point.sh Makefile.ssl Makefile
        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/include/openssl $(EXHEADER)
        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TEST)
+       @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TESTDATA)
        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/apps $(APPS)
 
 install:

diff --git a/fips/sha1/Makefile.ssl b/fips/sha1/Makefile.ssl
index b1067d2eace946afc7f0bb5ea4f9856c6ef6e5ee..904297fd2faa75fe6357e09c8ab28885b579e925 100644 (file)
--- a/fips/sha1/Makefile.ssl
+++ b/fips/sha1/Makefile.ssl
@@ -19,7 +19,8 @@ AR=           ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
-TEST= fips_sha1test.c sha1vectors.txt sha1hashes.txt
+TEST= fips_sha1test.c
+TESTDATA= sha1vectors.txt sha1hashes.txt
 APPS=
 EXE= fips_standalone_sha1
 
@@ -61,6 +62,7 @@ links:
        @$(TOP)/util/point.sh Makefile.ssl Makefile
        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/include/openssl $(EXHEADER)
        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TEST)
+       @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TESTDATA)
        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/apps $(APPS)
 
 install: