Bug 1052389 - Thunderbird can't package with MOZ_PACKAGE_JSSHELL due to looking for dozip.py in the wrong location r=ted,a=sledru
authorMark Banner <standard8@mozilla.com>
Wed, 13 Aug 2014 16:46:26 +0100
changeset 217704 284044e0c3f21b74acaa754a82a05bc6ae83918a
parent 217703 da558e9dcae3cad396091315751a7f4a2dc4a997
child 217705 4a8b8042fc7cbfd36a1eda3f0af546eb335012f3
push id515
push userraliiev@mozilla.com
push dateMon, 06 Oct 2014 12:51:51 +0000
treeherdermozilla-release@267c7a481bef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted, sledru
bugs1052389
milestone33.0a2
Bug 1052389 - Thunderbird can't package with MOZ_PACKAGE_JSSHELL due to looking for dozip.py in the wrong location r=ted,a=sledru
toolkit/mozapps/installer/packager.mk
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -120,17 +120,17 @@ else
 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 # Darwin
 endif # WINNT
 endif # MOZ_STATIC_JS
-MAKE_JSSHELL  = $(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/dozip.py $(PKG_JSSHELL) $(abspath $(JSSHELL_BINS))
+MAKE_JSSHELL  = $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/dozip.py $(PKG_JSSHELL) $(abspath $(JSSHELL_BINS))
 endif # LIBXUL_SDK
 
 _ABS_DIST = $(abspath $(DIST))
 JARLOG_DIR = $(abspath $(DEPTH)/jarlog/)
 JARLOG_FILE_AB_CD = $(JARLOG_DIR)/$(AB_CD).log
 
 TAR_CREATE_FLAGS := --exclude=.mkdir.done $(TAR_CREATE_FLAGS)
 CREATE_FINAL_TAR = $(TAR) -c --owner=0 --group=0 --numeric-owner \