equal
deleted
inserted
replaced
37 endif |
37 endif |
38 |
38 |
39 ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro) |
39 ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro) |
40 SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/metrolist.txt)) |
40 SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/metrolist.txt)) |
41 else |
41 else |
42 -SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt)) |
42 -SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt)) ddg |
43 +SEARCHPLUGINS_NAMES = $(shell cat \ |
43 +SEARCHPLUGINS_NAMES = $(shell cat \ |
44 + $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \ |
44 + $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \ |
45 + @srcdir@/en-US/searchplugins/list.txt ) ) |
45 + @srcdir@/en-US/searchplugins/list.txt ) ) ddg |
46 endif |
46 endif |
47 SEARCHPLUGINS_PATH := $(FINAL_TARGET)/searchplugins |
47 SEARCHPLUGINS_PATH := $(FINAL_TARGET)/searchplugins |
48 SEARCHPLUGINS := $(addsuffix .xml,$(SEARCHPLUGINS_NAMES)) |
48 SEARCHPLUGINS := $(addsuffix .xml,$(SEARCHPLUGINS_NAMES)) |
49 -PP_TARGETS += SEARCHPLUGINS |
49 -PP_TARGETS += SEARCHPLUGINS |
50 +#PP_TARGETS += SEARCHPLUGINS |
50 +#PP_TARGETS += SEARCHPLUGINS |