Bug 1133428 - Place PP_TARGETS manip above rules.mk. r=ewong, a=Callek (me) for CLOSED TREE SEA_COMM360_20150215_RELBRANCH SEAMONKEY_2_33b1_BUILD1 SEAMONKEY_2_33b1_RELEASE
authorJustin Wood <Callek@gmail.com>
Mon, 23 Feb 2015 20:37:08 -0500
branchSEA_COMM360_20150215_RELBRANCH
changeset 21656 739988b699a5aaaf286c3e13c3a5bf8182aa2b02
parent 21433 260a966457935808fe9262345dd207888dfee72c
child 21657 61d7d083d05a15232da2325d0127bae218a98a10
push idunknown
push userunknown
push dateunknown
reviewersewong, Callek
bugs1133428
Bug 1133428 - Place PP_TARGETS manip above rules.mk. r=ewong, a=Callek (me) for CLOSED TREE for L10n repackages should survive searchplugins missing, even if listed in list.txt
suite/locales/Makefile.in
--- a/suite/locales/Makefile.in
+++ b/suite/locales/Makefile.in
@@ -57,16 +57,23 @@ endif
 NON_OMNIJAR_FILES = \
 	defaults/messenger/mailViews.dat \
 	defaults/profile/panels.rdf \
 	defaults/profile/mimeTypes.rdf \
 	defaults/profile/chrome/userChrome-example.css \
 	defaults/profile/chrome/userContent-example.css \
 	$(NULL)
 
+SEARCH_PLUGINS_NAMES = $(shell cat $(call MERGE_FILE,searchplugins/list.txt))
+SEARCH_PLUGINS_PATH := $(FINAL_TARGET)/searchplugins
+.PHONY: searchplugins
+SEARCH_PLUGINS_TARGET := libs searchplugins
+SEARCH_PLUGINS := $(foreach plugin,$(addsuffix .xml,$(SEARCH_PLUGINS_NAMES)),$(or $(wildcard $(call MERGE_FILE,searchplugins/$(plugin))),$(info Missing searchplugin: $(plugin))))
+PP_TARGETS += SEARCH_PLUGINS
+
 include $(topsrcdir)/config/rules.mk
 
 include $(topsrcdir)/mozilla/toolkit/locales/l10n.mk
 
 $(STAGEDIST): $(DIST)/branding
 
 $(DIST)/branding:
 	$(NSINSTALL) -D $@
@@ -111,23 +118,16 @@ libs:: $(FINAL_TARGET)/defaults/profile/
 libs:: $(FINAL_TARGET)/defaults/profile/panels.rdf ;
 
 libs:: $(addprefix generic/profile/,$(PROFILE_FILES))
 	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile
 
 libs:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME)))
 	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile/chrome
 
-SEARCH_PLUGINS_NAMES = $(shell cat $(call MERGE_FILE,searchplugins/list.txt))
-SEARCH_PLUGINS_PATH := $(FINAL_TARGET)/searchplugins
-.PHONY: searchplugins
-SEARCH_PLUGINS_TARGET := libs searchplugins
-SEARCH_PLUGINS := $(foreach plugin,$(addsuffix .xml,$(SEARCH_PLUGINS_NAMES)),$(or $(wildcard $(call MERGE_FILE,searchplugins/$(plugin))),$(info Missing searchplugin: $(plugin))))
-PP_TARGETS += SEARCH_PLUGINS
-
 # Extend l10n.mk clobber-% target for our localised extensions
 clobber-%:
 	$(RM) -rf $(DIST)/xpi-stage/chatzilla-$* $(DIST)/xpi-stage/chatzilla-*.$*.xpi
 
 libs-%:
 	$(NSINSTALL) -D $(DIST)/install
 	@$(MAKE) -C $(DEPTH)/toolkit/locales libs-$*
 	@$(MAKE) -C $(DEPTH)/services/sync/locales AB_CD=$* XPI_NAME=locale-$*