Bug 953314 - Fix jsshell packaging of ICU libs, r=glandium
authorTed Mielczarek <ted@mielczarek.org>
Fri, 03 Jan 2014 08:00:37 -0500
changeset 162304 d1beadca2983335a3d1ed76ce85be114525f9776
parent 162303 b276b4e0bbcf967601f970a0ae9e030a70a23126
child 162305 1fef0d0e91716f5091e55c9a8ed4ed2044f68829
push idunknown
push userunknown
push dateunknown
reviewersglandium
bugs953314
milestone29.0a1
Bug 953314 - Fix jsshell packaging of ICU libs, r=glandium
toolkit/mozapps/installer/packager.mk
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -98,47 +98,45 @@ else
 JSSHELL_BINS += \
   $(DIST)/bin/$(DLL_PREFIX)nspr4$(DLL_SUFFIX) \
   $(DIST)/bin/$(DLL_PREFIX)plds4$(DLL_SUFFIX) \
   $(DIST)/bin/$(DLL_PREFIX)plc4$(DLL_SUFFIX) \
   $(NULL)
 endif # MOZ_FOLD_LIBS
 endif # MOZ_NATIVE_NSPR
 ifdef MOZ_SHARED_ICU
-ifdef XP_WIN
+ifeq ($(OS_TARGET), WINNT)
 ifdef MOZ_DEBUG
 JSSHELL_BINS += \
   $(DIST)/bin/icudtd$(MOZ_ICU_VERSION).dll \
   $(DIST)/bin/icuind$(MOZ_ICU_VERSION).dll \
   $(DIST)/bin/icuucd$(MOZ_ICU_VERSION).dll \
   $(NULL)
 else
 JSSHELL_BINS += \
   $(DIST)/bin/icudt$(MOZ_ICU_VERSION).dll \
   $(DIST)/bin/icuin$(MOZ_ICU_VERSION).dll \
   $(DIST)/bin/icuuc$(MOZ_ICU_VERSION).dll \
   $(NULL)
 endif # MOZ_DEBUG
 else
-ifdef XP_MACOSX
+ifeq ($(OS_TARGET), Darwin)
 JSSHELL_BINS += \
   $(DIST)/bin/libicudata.$(MOZ_ICU_VERSION).dylib \
   $(DIST)/bin/libicui18n.$(MOZ_ICU_VERSION).dylib \
   $(DIST)/bin/libicuuc.$(MOZ_ICU_VERSION).dylib \
   $(NULL)
 else
-ifdef XP_UNIX
 JSSHELL_BINS += \
   $(DIST)/bin/libicudata.so.$(MOZ_ICU_VERSION) \
   $(DIST)/bin/libicui18n.so.$(MOZ_ICU_VERSION) \
   $(DIST)/bin/libicuuc.so.$(MOZ_ICU_VERSION) \
   $(NULL)
-endif # XP_UNIX
-endif # XP_MACOSX
-endif # XP_WIN
+endif # Darwin
+endif # WINNT
 endif # MOZ_STATIC_JS
 MAKE_JSSHELL  = $(ZIP) -9j $(PKG_JSSHELL) $(JSSHELL_BINS)
 endif # LIBXUL_SDK
 
 _ABS_DIST = $(abspath $(DIST))
 JARLOG_DIR = $(abspath $(DEPTH)/jarlog/)
 JARLOG_FILE_AB_CD = $(JARLOG_DIR)/$(AB_CD).log