L10n repack bustage fix for Mac and Linux following bug 579718 landing in m-c and missing this change previously
authorMark Banner <bugzilla@standard8.plus.com>
Sat, 14 Aug 2010 20:23:26 +0100
changeset 6160 56d44fa3178f1eefc39d34b96a2403a3f985359f
parent 6159 6e5632e4d2f09f27128b944f32c595bcc2e47cd5
child 6161 168507b5752206426dc3e62c02e56a51549eab4f
push idunknown
push userunknown
push dateunknown
bugs579718
L10n repack bustage fix for Mac and Linux following bug 579718 landing in m-c and missing this change previously
mail/locales/Makefile.in
suite/locales/Makefile.in
--- a/mail/locales/Makefile.in
+++ b/mail/locales/Makefile.in
@@ -182,16 +182,17 @@ ifeq (WINNT,$(OS_ARCH))
 	cp ../installer/windows/l10ngen/helper.exe $(STAGEDIST)/uninstall
 	$(RM) $(_ABS_DIST)/l10n-stage/setup.exe
 	cp ../installer/windows/l10ngen/setup.exe $(_ABS_DIST)/l10n-stage
 endif
 # copy xpi-stage over, but not install.rdf and chrome.manifest,
 # those are just for language packs
 	cd $(DIST)/xpi-stage/locale-$(AB_CD) && \
 	  tar --exclude=install.rdf --exclude=chrome.manifest $(TAR_CREATE_FLAGS) - * | ( cd $(STAGEDIST) && tar -xf - )
+	mv $(STAGEDIST)/chrome/$(AB_CD).manifest $(STAGEDIST)/chrome/localized.manifest
 ifneq (en,$(AB))
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 	mv $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)/$(_APPNAME)/Contents/Resources/en.lproj $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)/$(_APPNAME)/Contents/Resources/$(AB).lproj
 endif
 endif
 	$(NSINSTALL) -D $(DIST)/l10n-stage/$(PKG_PATH)
 	cd $(DIST)/l10n-stage; \
 	  $(MAKE_PACKAGE)
--- a/suite/locales/Makefile.in
+++ b/suite/locales/Makefile.in
@@ -310,16 +310,17 @@ ifeq (WINNT,$(OS_ARCH))
 	$(RM) -r $(STAGEDIST)/uninstall
 	$(NSINSTALL) -D $(STAGEDIST)/uninstall
 	cp ../installer/windows/l10ngen/helper.exe $(STAGEDIST)/uninstall
 endif
 # copy xpi-stage over, but not install.rdf and chrome.manifest,
 # those are just for language packs
 	cd $(DIST)/xpi-stage/locale-$(AB_CD) && \
 	  tar --exclude=install.rdf --exclude=chrome.manifest $(TAR_CREATE_FLAGS) - * | ( cd $(STAGEDIST) && tar -xf - )
+	mv $(STAGEDIST)/chrome/$(AB_CD).manifest $(STAGEDIST)/chrome/localized.manifest
 	if test -d ../../mozilla/extensions/irc; then \
 	  $(MAKE) -C ../../mozilla/extensions/irc/locales repackage-zip-$(AB_CD) STAGEDIST=$(STAGEDIST); \
 	fi
 	if test -d ../../mozilla/extensions/venkman; then \
 	  $(MAKE) -C ../../mozilla/extensions/venkman/locales repackage-zip-$(AB_CD) STAGEDIST=$(STAGEDIST); \
 	fi
 ifneq (en,$(AB))
 ifneq (,$(filter cocoa,$(MOZ_WIDGET_TOOLKIT)))