Bug 1442149 - Re-instate MERGE_FILES and EN_US_OR_L10N_FILE. r=frg
authorEdmund Wong <ewong@pw-wspx.org>
Fri, 02 Mar 2018 11:06:37 +0800
changeset 31191 dada7b1b4e031e61e9d1522b5860beb9b5621b57
parent 31190 d32dfb61ec67ce1aa342fb3d27f93b4b95280924
child 31192 f22b7a839730467a908b1d4f2561c28bab28073c
push id383
push userclokep@gmail.com
push dateMon, 07 May 2018 21:52:48 +0000
reviewersfrg
bugs1442149
Bug 1442149 - Re-instate MERGE_FILES and EN_US_OR_L10N_FILE. r=frg
suite/locales/Makefile.in
--- a/suite/locales/Makefile.in
+++ b/suite/locales/Makefile.in
@@ -107,16 +107,25 @@ BOOKMARKS_XTRA_FILE = $(call MERGE_FILE,
 	cp $^ profile/
 	$(call py_action,preprocessor, \
 	  -DAB_CD=$(NO_JA_JP_MAC_AB_CD) \
 	  profile/bookmarks.html.in \
 	  -o $@)
 
 PANELS_XTRA_FILE = $(call MERGE_FILE,profile/panels.extra)
 
+MERGE_FILES = $(foreach f,$(1),$(call MERGE_FILE,$(f)))
+
+# These macros are similar to MERGE_FILE, but no merging, and en-US first.
+# They're used for searchplugins, for example.
+EN_US_OR_L10N_FILE = $(firstword \
+	$(wildcard $(srcdir)/en-US/$(1)) \
+	$(LOCALE_SRCDIR)/$(1) )
+EN_US_OR_L10N_FILES = $(foreach f,$(1),$(call EN_US_OR_L10N_FILE,$(f)))
+
 # the #include in the .in file requires all to be in the same dir, sadly.
 %/defaults/profile/panels.rdf: $(PANELS_XTRA_FILE) generic/profile/panels.rdf.in
 	$(SYSINSTALL) -D $(dir $@)
 	$(RM) -rf profile/panels*
 	$(NSINSTALL) -D profile
 	cp $^ profile/
 	sed \
 	  -n 's/.*<RDF:Description about="\(.*\)">.*/        <RDF:li resource="\1"\/>/p' \