bug 1370506, use MERGE_FILE instead of vpath to pick up merged files,…

… r=glandium

This makes l10n-merge more consistent in how it works, and thus the following
changes that change that behavior easier.

MozReview-Commit-ID: IsKm9rBO4Dg

--HG--
extra : rebase_source : 73529e72a0aff2ca024584518548ff4aa519f47b

browser/locales/Makefile.in

@@ -5,14 +5,6 @@
 
 include $(topsrcdir)/config/config.mk
 
-ifdef LOCALE_MERGEDIR
-vpath crashreporter%.ini $(LOCALE_MERGEDIR)/browser/crashreporter
-endif
-vpath crashreporter%.ini $(LOCALE_SRCDIR)/crashreporter
-ifdef LOCALE_MERGEDIR
-vpath crashreporter%.ini @srcdir@/en-US/crashreporter
-endif
-
 
 SUBMAKEFILES += \
 	$(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/Makefile \
@@ -186,7 +178,7 @@ endif
 endif
 
 ifdef MOZ_CRASHREPORTER
-libs:: crashreporter-override.ini
+libs:: $(call MERGE_FILE,crashreporter/crashreporter-override.ini)
 	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)
 endif
 

toolkit/locales/Makefile.in

@@ -4,14 +4,6 @@
 
 include $(topsrcdir)/config/rules.mk
 
-ifdef LOCALE_MERGEDIR
-vpath crashreporter.% $(LOCALE_MERGEDIR)/toolkit/crashreporter
-endif
-vpath crashreporter.% $(LOCALE_SRCDIR)/crashreporter
-ifdef LOCALE_MERGEDIR
-vpath crashreporter.% @srcdir@/en-US/crashreporter
-endif
-
 libs-%: AB_CD=$*
 libs-%:
 	@$(MAKE) -C ../../netwerk/locales/ libs AB_CD=$* XPI_NAME=locale-$*
@@ -33,7 +25,7 @@ libs:: update.locale
 	sed -e 's/%AB_CD%/$(AB_CD)/' $< > $(FINAL_TARGET)/update.locale
 
 ifdef MOZ_CRASHREPORTER
-libs:: crashreporter.ini
+libs:: $(call MERGE_FILE,crashreporter/crashreporter.ini)
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/crashreporter.app/Contents/Resources
 else