Permalink
Browse files

bug 466894: fix MAR generation for locales. r=bhearsum - relbranch la…

…nding

--HG--
branch : GECKO191b2_20081125_RELBRANCH
  • Loading branch information...
1 parent 0d294ea commit 0820a2c6d6e3e3de5247bdd9b65deb50be4c794d Axel Hecht committed Nov 27, 2008
Showing with 8 additions and 5 deletions.
  1. +8 −5 browser/locales/Makefile.in
@@ -322,7 +322,14 @@ endif
$(NSINSTALL) -D $(DIST)/l10n-stage/$(PKG_PATH)
cd $(DIST)/l10n-stage; \
$(MAKE_PACKAGE)
- # packaging done, undo l10n stuff
+ifdef MOZ_MAKE_COMPLETE_MAR
+ $(MAKE) -C $(DEPTH)/tools/update-packaging full-update AB_CD=$(AB_CD) \
+ MOZ_PKG_PRETTYNAMES=$(MOZ_PKG_PRETTYNAMES) \
+ STAGEDIST="$(_ABS_DIST)/install" \
+ PACKAGE_BASE_DIR="$(_ABS_DIST)/l10n-stage" \
+ DIST="$(_ABS_DIST)"
+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
@@ -349,10 +356,6 @@ langpack-%: libs-%
# 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.
-#
-# Note: the last target called here should be repackage-zip-$* as the l10n build
-# systems rely on dist/l10n-stage/<product> to be in place in order to package
-# the complete MAR files.
installers-%: clobber-% langpack-% repackage-win32-installer-% repackage-zip-%
@echo "repackaging done"

0 comments on commit 0820a2c

Please sign in to comment.