diff -up ./cmd/Makefile.skipthem ./cmd/Makefile
--- ./cmd/Makefile.skipthem	2021-05-28 02:50:43.000000000 -0700
+++ ./cmd/Makefile	2021-06-03 15:16:36.015186252 -0700
@@ -19,7 +19,11 @@ BLTEST_SRCDIR =
 ECPERF_SRCDIR =
 FREEBL_ECTEST_SRCDIR =
 FIPSTEST_SRCDIR =
+ifeq ($(NSS_BLTEST_NOT_AVAILABLE),1)
+SHLIBSIGN_SRCDIR = shlibsign
+else
 SHLIBSIGN_SRCDIR =
+endif
 else
 BLTEST_SRCDIR = bltest
 ECPERF_SRCDIR = ecperf
diff -up ./cmd/shlibsign/Makefile.skipthem ./cmd/shlibsign/Makefile
--- ./cmd/shlibsign/Makefile.skipthem	2021-06-03 15:16:36.015186252 -0700
+++ ./cmd/shlibsign/Makefile	2021-06-03 15:18:49.494720335 -0700
@@ -95,7 +95,3 @@ else
     endif
 endif
 
-libs: install
-ifdef CHECKLOC
-	$(MAKE) $(CHECKLOC)
-endif