Commit a3d8439a authored by Mike Hommey's avatar Mike Hommey
Browse files

Bug 729010 - Properly package jsshell libraries. r=khuey

parent 5d7637ed

toolkit/mozapps/installer/packager.mk

+4 −7
Original line number Diff line number Diff line
@@ -86,14 +86,11 @@ SDK = $(SDK_PATH)$(PKG_BASENAME).sdk$(SDK_SUFFIX) 
ifndef LIBXUL_SDK

JSSHELL_BINS  = \

  $(DIST)/bin/js$(BIN_SUFFIX) \

  $(DIST)/bin/mozglue$(DLL_SUFFIX) \

  $(DIST)/bin/$(DLL_PREFIX)mozglue$(DLL_SUFFIX) \

  $(NULL)

ifndef MOZ_NATIVE_NSPR

JSSHELL_BINS += $(DIST)/bin/$(LIB_PREFIX)nspr4$(DLL_SUFFIX)

JSSHELL_BINS += $(DIST)/bin/$(DLL_PREFIX)nspr4$(DLL_SUFFIX)

ifeq ($(OS_ARCH),WINNT)

ifdef MOZ_MEMORY

JSSHELL_BINS += $(DIST)/bin/jemalloc$(DLL_SUFFIX)

endif

ifeq ($(_MSC_VER),1400)

JSSHELL_BINS += $(DIST)/bin/Microsoft.VC80.CRT.manifest

JSSHELL_BINS += $(DIST)/bin/msvcr80.dll
@@ -110,8 +107,8 @@ JSSHELL_BINS += $(DIST)/bin/msvcr110.dll 
endif

else

JSSHELL_BINS += \

  $(DIST)/bin/$(LIB_PREFIX)plds4$(DLL_SUFFIX) \

  $(DIST)/bin/$(LIB_PREFIX)plc4$(DLL_SUFFIX) \

  $(DIST)/bin/$(DLL_PREFIX)plds4$(DLL_SUFFIX) \

  $(DIST)/bin/$(DLL_PREFIX)plc4$(DLL_SUFFIX) \

  $(NULL)

endif

endif # MOZ_NATIVE_NSPR