Elio Maldonado f6ec573
diff -up nss/cmd/Makefile.skipthem nss/cmd/Makefile
Elio Maldonado f6ec573
--- nss/cmd/Makefile.nobltest	2013-05-28 14:43:24.000000000 -0700
Elio Maldonado f6ec573
+++ nss/cmd/Makefile	2013-06-15 11:51:11.669655168 -0700
Elio Maldonado f6ec573
@@ -14,10 +14,10 @@ ifdef BUILD_LIBPKIX_TESTS
Elio Maldonado f6ec573
 DIRS += libpkix
Elio Maldonado f6ec573
 endif
Elio Maldonado f6ec573
 
Elio Maldonado f6ec573
-ifeq ($(NSS_BUILD_WITHOUT_SOFTOKEN),1)
Elio Maldonado f6ec573
+ifeq ($(NSS_BLTEST_NOT_AVAILABLE),1)
Elio Maldonado f6ec573
 BLTEST_SRCDIR =
Elio Maldonado f6ec573
-FIPSTEST_SRCDIR =
Elio Maldonado f6ec573
-SHLIBSIGN_SRCDIR =
Elio Maldonado f6ec573
+FIPSTEST_SRCDIR =
Elio Maldonado f6ec573
+SHLIBSIGN_SRCDIR = shlibsign
Elio Maldonado f6ec573
 else
Elio Maldonado f6ec573
 BLTEST_SRCDIR = bltest
Elio Maldonado f6ec573
 FIPSTEST_SRCDIR = fipstest