Bug 460977 - make -C browser/locales langpack-AB_CD is not compatible with --enable-chrome-format=flat; r=(bhearsum + l10n + ted.mielczarek)
authorSerge Gautherie <sgautherie.bz@free.fr>
Thu, 25 Dec 2008 01:06:37 +0100
changeset 23052 579407c55f2d6507884d1993f8851e325d36e69d
parent 23051 6629bb8baf418adc58665634f58d777851debd36
child 23053 5428595e217c8c1ea7a5c4386587e5ee1bba82a9
push idunknown
push userunknown
push dateunknown
bugs460977
milestone1.9.2a1pre
Bug 460977 - make -C browser/locales langpack-AB_CD is not compatible with --enable-chrome-format=flat; r=(bhearsum + l10n + ted.mielczarek) [Fixing mistake during manual apply of the patch :-<]
browser/locales/Makefile.in
--- a/browser/locales/Makefile.in
+++ b/browser/locales/Makefile.in
@@ -324,17 +324,16 @@ repackage-zip-%: $(ZIP_IN) $(STAGEDIST) 
 langpack-%: LANGPACK_FILE=$(_ABS_DIST)/$(PKG_LANGPACK_PATH)$(PKG_LANGPACK_BASENAME).xpi
 langpack-%: AB_CD=$*
 langpack-%: XPI_NAME=locale-$*
 langpack-%: libs-%
 	@echo "Making langpack $(LANGPACK_FILE)"
 	$(NSINSTALL) -D $(DIST)/$(PKG_LANGPACK_PATH)
 	$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) -I$(call EXPAND_LOCALE_SRCDIR,toolkit/locales)/defines.inc -I$(LOCALE_SRCDIR)/defines.inc $(srcdir)/generic/install.rdf > $(FINAL_TARGET)/install.rdf
 	cd $(DIST)/xpi-stage/locale-$(AB_CD) && \
-	  $(ZIP) -r9D $(LANGPACK_FILE) install.rdf chrome/$(AB_CD).jar chrome.manifest
 	  $(ZIP) -r9D $(LANGPACK_FILE) install.rdf chrome chrome.manifest -x chrome/$(AB_CD).manifest
 
 # This is a generic target that will make a langpack, repack ZIP (+tarball)
 # builds, and repack an installer if applicable. It is called from the
 # tinderbox scripts. Alter it with caution.
 
 installers-%: clobber-% langpack-% repackage-win32-installer-% repackage-zip-%
 	@echo "repackaging done"