Fix a few issues with 'make distribution'.
authorFlorian Quèze <florian@instantbird.org>
Sun, 11 Jul 2010 12:56:14 +0200
changeset 14374 ef07fb155ff3b6f01ac017c09fb31f07a52a7146
parent 14373 16589d4d103280a2f6548a9a75cfdc0714d3f790
child 14375 6b1a1853201e9f74191f43c46792c80cf162de35
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)
Fix a few issues with 'make distribution'.
im/build.mk
--- a/im/build.mk
+++ b/im/build.mk
@@ -144,24 +144,25 @@ ifdef MOZ_UPDATE_PACKAGING
 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)
+	touch $(PATCH_FILE)
 	$(foreach marline,$(shell $(LIST_PREVIOUS_MAR_CMD)),\
 	  $(foreach MAR_FILE_SRC,$(shell echo $(marline) |cut -d : -f 3),\
 	    $(foreach AB_CD,$(filter $(shell echo $(marline) |cut -d : -f 2),$(AB_CD) $(SHIPPED_LOCALES)),\
 	      $(foreach buildid,$(shell echo $(marline) |cut -d : -f 1),\
 		mkdir -p $(PREVIOUS_MAR_DIR)/$(buildid) ; \
 	        $(DOWNLOAD_MAR_CMD) ; \
 		echo "$(MAR_FILE_DEST),$(DIST)/$(COMPLETE_MAR),$(DIST)/$(PKG_UPDATE_PATH)$(PKG_UPDATE_BASENAME).partial.from-$(buildid).mar,$(FORCE_UPDATE)" >> $(PATCH_FILE) ;))))
-	PATH=$(call core_abspath,$(LIBXUL_DIST))/host/bin:$(PATH) $(PYTHON) $(MOZILLA_SRCDIR)/tools/update-packaging/make_incremental_updates.py -f $(PATCH_FILE)
+	PATH="$(call core_abspath,$(LIBXUL_DIST))/host/bin:$(PATH)" $(PYTHON) $(MOZILLA_SRCDIR)/tools/update-packaging/make_incremental_updates.py -f $(PATCH_FILE)
 endif
 endif
 ifdef SYMBOL_SERVER_HOST
 	@$(MAKE) uploadsymbols
 endif
 ifdef UPLOAD_CMD
 	$(MAKE) upload
 endif