Another attempt to fix the Windows packaging bustage caused by the changes in: 'Bug 313956 - expand installer .exe contents to make complete mar'.
authorFlorian Quèze <florian@instantbird.org>
Wed, 06 Jul 2011 11:50:44 +0200
changeset 14626 0ad8bc35a7e1f07247e283c0b4b73d0e6ff3cf09
parent 14625 332847368c8ac86a4bc3847492a073fb7e0841e2
child 14627 79ad9743bfb5bf5f5d31f8cd010e8d2336103dcc
push id9778
push userflorian@queze.net
push dateSun, 12 Jan 2014 18:25:45 +0000
treeherdercomm-central@f81a23bfefcd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs313956
Another attempt to fix the Windows packaging bustage caused by the changes in: 'Bug 313956 - expand installer .exe contents to make complete mar'.
im/build.mk
--- a/im/build.mk
+++ b/im/build.mk
@@ -135,17 +135,17 @@ FORCE_UPDATE := components/components.li
 # SYMBOL_SERVER_PATH=/www/instantbird/socorro/symbols
 # SYMBOL_SERVER_PORT=22
 # SYMBOL_SERVER_USER=buildbot
 
 distribution:
 	@$(MAKE) buildsymbols
 	@$(MAKE) -C instantbird/installer libs installer
 ifdef MOZ_UPDATE_PACKAGING
-	PKG_INST_PATH= $(MAKE) -C $(MOZDEPTH)/tools/update-packaging full-update
+	$(MAKE) -C $(MOZDEPTH)/tools/update-packaging full-update PKG_INST_PATH=
 endif
 ifdef L10NBASEDIR
 	$(foreach locale,$(SHIPPED_LOCALES),$(MAKE) -C instantbird/locales/ repack-$(locale) LOCALE_MERGEDIR=mergedir ;)
 endif
 ifdef MOZ_UPDATE_PACKAGING
 ifdef LIST_PREVIOUS_MAR_CMD
 	rm -rf $(PREVIOUS_MAR_DIR) $(PATCH_FILE)
 	mkdir $(PREVIOUS_MAR_DIR)