Fix a conditional test for sectoollib BUG1186917_BRANCH
authorElio Maldonado <emaldona@redhat.com>
Fri, 18 Dec 2015 08:32:29 -0800
branchBUG1186917_BRANCH
changeset 11795 31543e931af4ce0069f6dccb5958e1b33a718392
parent 11794 ffb14a08eaaec10d06d0e97c7bf2636a4cabb74f
child 11796 1816cd2839df71f9365cf39706749db2c3e755d8
push id916
push useremaldona@redhat.com
push dateFri, 18 Dec 2015 16:32:39 +0000
Fix a conditional test for sectoollib
cmd/manifest.mn
cmd/platlibs.mk
--- a/cmd/manifest.mn
+++ b/cmd/manifest.mn
@@ -16,17 +16,16 @@ else
 REQUIRES = nss nspr libdbm
 LIB_SRCDIRS = \
  lib \
  $(NULL)
 endif
 
 ifndef NSS_BUILD_UTIL_ONLY
 SOFTOKEN_SRCDIRS = \
- lib \
  $(BLTEST_SRCDIR) \
  $(FIPSTEST_SRCDIR)  \
  $(LOWHASHTEST_SRCDIR)  \
  $(SHLIBSIGN_SRCDIR) \
  $(NULL)
 endif
 
 ifndef NSS_BUILD_SOFTOKEN_ONLY
--- a/cmd/platlibs.mk
+++ b/cmd/platlibs.mk
@@ -68,17 +68,17 @@ PKIXLIB = \
 endif
 
 NSS_LIBS_1=
 SECTOOL_LIB=
 NSS_LIBS_2=
 NSS_LIBS_3=
 NSS_LIBS_4=
 
-ifneq ($(NSS_BUILD_SOFTOKEN_ONLY),1)
+ifneq ($(NSS_BUILD_UTIL_ONLY),1)
 SECTOOL_LIB = \
 	$(DIST)/lib/$(LIB_PREFIX)sectool.$(LIB_SUFFIX) \
 	$(NULL)
 else
 SECTOOL_LIB = \
 	$(NULL)
 endif