Backed out changeset d57f05bcdbe1 (because we're reverting the patch this is on top of). GECKO1912_20090729_RELBRANCH
authorBen Hearsum <bhearsum@mozilla.com>
Thu, 30 Jul 2009 11:05:21 -0400
branchGECKO1912_20090729_RELBRANCH
changeset 26179 79b6e73e853a228a5d85809328294ed8b0d18e1d
parent 26173 d57f05bcdbe11ca8c96269eac4223f1c6f9dc92d
child 26180 a6308d41af58c3e89e0110003c160409cb25a5b2
push id1843
push userbhearsum@mozilla.com
push dateThu, 30 Jul 2009 15:14:12 +0000
milestone1.9.1.2
backs outd57f05bcdbe11ca8c96269eac4223f1c6f9dc92d
Backed out changeset d57f05bcdbe1 (because we're reverting the patch this is on top of).
toolkit/locales/l10n.mk
--- a/toolkit/locales/l10n.mk
+++ b/toolkit/locales/l10n.mk
@@ -140,18 +140,17 @@ endif
 	$(NSINSTALL) -D $(DIST)/l10n-stage/$(PKG_PATH)
 	cd $(DIST)/l10n-stage; \
 	  $(MAKE_PACKAGE)
 ifdef MOZ_MAKE_COMPLETE_MAR
 	$(MAKE) -C $(DEPTH)/tools/update-packaging full-update AB_CD=$(AB_CD) \
 	  MOZ_PKG_PRETTYNAMES=$(MOZ_PKG_PRETTYNAMES) \
 	  PACKAGE_BASE_DIR="$(_ABS_DIST)/l10n-stage" \
 	  DIST="$(_ABS_DIST)"
-# XXX switch this back on once bug 496196's generate-snippet lands on 1.9.1
-#	$(MAKE) generate-snippet-$(AB_CD)  
+	$(MAKE) generate-snippet-$(AB_CD)  
 endif
 # packaging done, undo l10n stuff
 ifneq (en,$(AB))
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 	mv $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)/$(_APPNAME)/Contents/Resources/$(AB).lproj $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)/$(_APPNAME)/Contents/Resources/en.lproj
 endif
 endif
 	$(MAKE) clobber-zip AB_CD=$(AB_CD)