From bb6cd1e67d3a14c5462eeef4c45d0b695df244be Mon Sep 17 00:00:00 2001 From: Takanori MATSUURA Date: Thu, 15 Dec 2011 14:47:04 +0000 Subject: [PATCH] Bug 710268 - Sign NSS libraries only when they exist; r=dtownsend --- toolkit/mozapps/installer/packager.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk index 9a577a1e074..65e64ee6599 100644 --- a/toolkit/mozapps/installer/packager.mk +++ b/toolkit/mozapps/installer/packager.mk @@ -571,8 +571,8 @@ FREEBL_64FPU = $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(DLL_PREFIX)freebl FREEBL_64INT = $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(DLL_PREFIX)freebl_64int_3$(DLL_SUFFIX) SIGN_NSS += \ - $(SIGN_CMD) $(SOFTOKN) && \ - $(SIGN_CMD) $(NSSDBM) && \ + if test -f $(SOFTOKN); then $(SIGN_CMD) $(SOFTOKN); fi && \ + if test -f $(NSSDBM); then $(SIGN_CMD) $(NSSDBM); fi && \ if test -f $(FREEBL); then $(SIGN_CMD) $(FREEBL); fi && \ if test -f $(FREEBL_32FPU); then $(SIGN_CMD) $(FREEBL_32FPU); fi && \ if test -f $(FREEBL_32INT); then $(SIGN_CMD) $(FREEBL_32INT); fi && \ @@ -581,7 +581,7 @@ SIGN_NSS += \ if test -f $(FREEBL_64INT); then $(SIGN_CMD) $(FREEBL_64INT); fi; endif # MOZ_PSM -endif # !CROSS_COMPILE +endif # MOZ_CAN_RUN_PROGRAMS NO_PKG_FILES += \ core \