2013-04-09 23:14:36 +00:00
|
|
|
diff -up nss/cmd/Makefile.nosoftokentests nss/cmd/Makefile
|
2013-06-15 19:48:12 +00:00
|
|
|
--- nss/cmd/Makefile.nosoftokentests 2013-05-30 23:43:20.982027783 -0700
|
|
|
|
+++ nss/cmd/Makefile 2013-05-30 23:47:11.865874884 -0700
|
|
|
|
@@ -19,9 +19,15 @@ BLTEST_SRCDIR =
|
|
|
|
FIPSTEST_SRCDIR =
|
|
|
|
SHLIBSIGN_SRCDIR =
|
|
|
|
else
|
|
|
|
+ifeq ($(NSS_BUILD_WITHOUT_SOFTOKEN),1)
|
|
|
|
+BLTEST_SRCDIR =
|
|
|
|
+FIPSTEST_SRCDIR =
|
|
|
|
+SHLIBSIGN_SRCDIR =
|
|
|
|
+else
|
|
|
|
BLTEST_SRCDIR = bltest
|
|
|
|
FIPSTEST_SRCDIR = fipstest
|
|
|
|
SHLIBSIGN_SRCDIR = shlibsign
|
|
|
|
+endif
|
2012-12-17 06:25:51 +00:00
|
|
|
endif
|
|
|
|
|
2012-12-23 01:50:41 +00:00
|
|
|
LOWHASHTEST_SRCDIR=
|