Fix calendar l10n bustage from bug 690560. r=bustage fix,a=Standard8
authorMark Banner <bugzilla@standard8.plus.com>
Wed, 19 Oct 2011 10:41:03 +0100
changeset 9299 e1034d243030c5bf605980a822f15d0074e7d59b
parent 9298 345b79cbefce09ac2718f1faab129e8cadfeb6cd
child 9300 603a1f04140b6d38e162deebcc6a6df13b3be5d1
push id230
push userbugzilla@standard8.plus.com
push dateTue, 08 Nov 2011 22:55:24 +0000
treeherdercomm-beta@63dad5648415 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage, Standard8
bugs690560
Fix calendar l10n bustage from bug 690560. r=bustage fix,a=Standard8
calendar/lightning/lightning-packager.mk
--- a/calendar/lightning/lightning-packager.mk
+++ b/calendar/lightning/lightning-packager.mk
@@ -59,21 +59,21 @@ ifndef WGET
 	$(error wget not installed)
 endif
 	(cd $(DIST)/xpi-stage && $(WGET) -nv -N $(EN_US_BINARY_URL)/$(XPI_NAME).xpi)
 	@echo "Downloaded $(EN_US_BINARY_URL)/$(PACKAGE) to	$(ZIP_IN)"
 
 unpack: $(ZIP_IN)
 # We're unpacking directly into FINAL_TARGET, this keeps code to do manual
 # repacks cleaner.
-	if test -d $(DIST)/$(UNIVERSAL_PATH)xpi-stage/$(FINAL_XPI_NAME); then \
-	  $(RM) -r -v $(DIST)/$(UNIVERSAL_PATH)xpi-stage/$(FINAL_XPI_NAME); \
+	if test -d $(DIST)/$(UNIVERSAL_PATH)xpi-stage/$(XPI_NAME); then \
+	  $(RM) -r -v $(DIST)/$(UNIVERSAL_PATH)xpi-stage/$(XPI_NAME); \
 	fi
-	$(NSINSTALL) -D $(DIST)/$(UNIVERSAL_PATH)xpi-stage/$(FINAL_XPI_NAME)
-	cd $(DIST)/$(UNIVERSAL_PATH)/xpi-stage/$(FINAL_XPI_NAME) && $(UNZIP) $(ZIP_IN)
+	$(NSINSTALL) -D $(DIST)/$(UNIVERSAL_PATH)xpi-stage/$(XPI_NAME)
+	cd $(DIST)/$(UNIVERSAL_PATH)/xpi-stage/$(XPI_NAME) && $(UNZIP) $(ZIP_IN)
 	@echo done unpacking
 
 # Call this target to upload the localized lightning package.
 l10n-upload-%: AB_CD=$*
 l10n-upload-%:
 	$(PYTHON) $(MOZILLA_SRCDIR)/build/upload.py --base-path $(DIST)/$(UNIVERSAL_PATH)xpi-stage/  "$(L10N_TARGET).xpi"
 
 # Call this target to trigger repackaging lightning for a specific language