Bug 916625 Fix bug 912292 fallout by packaging and installing extensions later r=Callek a=Standard8
authorNeil Rashbrook <neil@parkwaycc.co.uk>
Mon, 16 Sep 2013 16:45:31 +0100
changeset 13056 24c9b80011a2838b4c3d731769156b255ff4d16c
parent 13055 55c9e25ba55a200e51677e9938e1d17e941ffea9
child 13057 452390823d77e524ac37b18d8b012a9da3b8ef12
push id9507
push userneil@parkwaycc.co.uk
push dateMon, 16 Sep 2013 15:46:00 +0000
treeherdercomm-central@24c9b80011a2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersCallek, Standard8
bugs916625, 912292
Bug 916625 Fix bug 912292 fallout by packaging and installing extensions later r=Callek a=Standard8
config/rules.mk
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -1476,17 +1476,17 @@ endif
 
 ifneq ($(DIST_CHROME_FILES),)
 DIST_CHROME_FILES_PATH := $(FINAL_TARGET)/chrome
 DIST_CHROME_FILES_FLAGS := $(XULAPP_DEFINES)
 PP_TARGETS += DIST_CHROME_FILES
 endif
 
 ifneq ($(XPI_PKGNAME),)
-libs realchrome::
+tools realchrome::
 ifdef STRIP_XPI
 ifndef MOZ_DEBUG
 	@echo "Stripping $(XPI_PKGNAME) package directory..."
 	@echo $(FINAL_TARGET)
 	@cd $(FINAL_TARGET) && find . ! -type d \
 			! -name "*.js" \
 			! -name "*.xpt" \
 			! -name "*.gif" \
@@ -1515,17 +1515,17 @@ endif
 	cd $(FINAL_TARGET) && $(ZIP) -qr ../$(XPI_PKGNAME).xpi *
 endif
 
 ifdef INSTALL_EXTENSION_ID
 ifndef XPI_NAME
 $(error XPI_NAME must be set for INSTALL_EXTENSION_ID)
 endif
 
-libs::
+tools::
 	$(RM) -r "$(DIST)/bin/extensions/$(INSTALL_EXTENSION_ID)"
 	$(NSINSTALL) -D "$(DIST)/bin/extensions/$(INSTALL_EXTENSION_ID)"
 	cd $(FINAL_TARGET) && tar $(TAR_CREATE_FLAGS) - . | (cd "../../bin/extensions/$(INSTALL_EXTENSION_ID)" && tar -xf -)
 
 endif
 
 ifneq (,$(filter flat symlink,$(MOZ_CHROME_FILE_FORMAT)))
 _JAR_REGCHROME_DISABLE_JAR=1