Bug 554993 followup, review nits that somehow did not get pushed. r=KaiRo
authorJustin Wood <Callek@gmail.com>
Sun, 06 Mar 2011 21:07:23 -0500
changeset 7266 cfb248080a91eb21605ddf99f37aabbe04cd1aa3
parent 7265 4ba201da6c480c2aca420307d89ae56edd9ab39d
child 7267 7b7a231b4a437c41de4ad4371b1215f9dcc95bb9
push idunknown
push userunknown
push dateunknown
reviewersKaiRo
bugs554993
Bug 554993 followup, review nits that somehow did not get pushed. r=KaiRo
suite/locales/Makefile.in
--- a/suite/locales/Makefile.in
+++ b/suite/locales/Makefile.in
@@ -84,18 +84,17 @@ DEFINES += \
 	$(NULL)
 
 PREF_JS_EXPORTS = $(call find_locale_file,suite-l10n.js)
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 MOZ_PKG_MAC_DSSTORE=$(_ABS_DIST)/branding/dsstore
 MOZ_PKG_MAC_BACKGROUND=$(_ABS_DIST)/branding/background.png
 MOZ_PKG_MAC_ICON=$(_ABS_DIST)/branding/disk.icns
-MOZ_PKG_MAC_EXTRA=--format UDBZ \
-                  --symlink "/Applications: " \
+MOZ_PKG_MAC_EXTRA=--symlink "/Applications:/ " \
                   --copy "$(LOCALE_SRCDIR)/installer/mac/README.txt"
 endif
 
 ifeq (WINNT,$(OS_ARCH))
 UNINSTALLER_PACKAGE_HOOK = $(RM) -r $(STAGEDIST)/uninstall; \
 	$(NSINSTALL) -D $(STAGEDIST)/uninstall; \
 	cp ../installer/windows/l10ngen/helper.exe $(STAGEDIST)/uninstall; \
 	$(RM) $(_ABS_DIST)/l10n-stage/setup.exe; \
@@ -196,17 +195,17 @@ install:: $(DESTDIR)$(mozappdir)/default
 install:: $(DESTDIR)$(mozappdir)/defaults/profile/panels.rdf ;
 
 install:: $(addprefix generic/profile/,$(PROFILE_FILES))
 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile
 
 install:: $(addprefix $(LOCALE_SRCDIR)/profile/chrome/,$(PROFILE_CHROME))
 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile/chrome
 
-SEARCH_PLUGINS = $(shell cat $(LOCALE_SRCDIR)/searchplugins/list.txt)
+SEARCH_PLUGINS = $(call find_locale_file,searchplugins/list.txt)
 
 libs:: $(addsuffix .xml,$(SEARCH_PLUGINS))
 	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/searchplugins
 
 install:: $(addsuffix .xml,$(SEARCH_PLUGINS))
 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/searchplugins
 
 # Extend l10n.mk clobber-% target for our localised extensions