# HG changeset patch

# User Takanori MATSUURA <t.matsuu@gmail.com>

# Date 1323798527 -32400

# Node ID f98be8c8e4e799e7ba8ddc367122edeccaaaca43

# Parent  4b71b1e9cc0c30b13ee67d71d4030b6754ab0e38

Bug 710268 - sign NSS libraries only when they exist

diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk

--- a/toolkit/mozapps/installer/packager.mk

+++ b/toolkit/mozapps/installer/packager.mk

@@ -566,27 +566,27 @@ NSSDBM		= $(DIST)/$(STAGEPATH)$(MOZ_PKG_

 FREEBL		= $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(DLL_PREFIX)freebl3$(NSS_DLL_SUFFIX)

 FREEBL_32FPU	= $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(DLL_PREFIX)freebl_32fpu_3$(DLL_SUFFIX)

 FREEBL_32INT	= $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(DLL_PREFIX)freebl_32int_3$(DLL_SUFFIX)

 FREEBL_32INT64	= $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(DLL_PREFIX)freebl_32int64_3$(DLL_SUFFIX)

 FREEBL_64FPU	= $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(DLL_PREFIX)freebl_64fpu_3$(DLL_SUFFIX)

 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 && \

   if test -f $(FREEBL_32INT64); then $(SIGN_CMD) $(FREEBL_32INT64); fi && \

   if test -f $(FREEBL_64FPU); then $(SIGN_CMD) $(FREEBL_64FPU); fi && \

   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 \

 	bsdecho \

 	js \

 	js-config \

 	jscpucfg \

 	nsinstall \