Bug 1439742 - Pre: Remove unused MERGE_FILES and EN_US_OR_L10N_FILE{S}. r=ted.mielczarek
MozReview-Commit-ID: 3jMUXSaooVW
--- a/config/config.mk
+++ b/config/config.mk
@@ -374,24 +374,16 @@ endif # ! relativesrcdir
ifdef IS_LANGUAGE_REPACK
MERGE_FILE = $(firstword \
$(wildcard $(REAL_LOCALE_MERGEDIR)/$(subst /locales,,$(LOCALE_RELATIVEDIR))/$(1)) \
$(wildcard $(LOCALE_SRCDIR)/$(1)) \
$(srcdir)/en-US/$(1) )
else
MERGE_FILE = $(LOCALE_SRCDIR)/$(1)
endif
-MERGE_FILES = $(foreach f,$(1),$(call MERGE_FILE,$(f)))
-
-# These marcros 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)))
ifneq (WINNT,$(OS_ARCH))
RUN_TEST_PROGRAM = $(DIST)/bin/run-mozilla.sh
endif # ! WINNT
#
# Java macros
#