Follow up to bug 587984 bustage fix for l10n repacks. r=Pike,ted,a=bustage-fix
authorMark Banner <bugzilla@standard8.plus.com>
Thu, 19 Aug 2010 20:21:56 +0100
changeset 50941 3bd62d4590197e5302d92bd48ace5a5aead8b176
parent 50940 e1ca9091e5a621fce2237ab35f8e5263bee5712a
child 50942 73899b33ca4b60315317de5a7ff7e8e556f724c9
push idunknown
push userunknown
push dateunknown
reviewersPike, ted, bustage-fix
bugs587984
milestone2.0b5pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Follow up to bug 587984 bustage fix for l10n repacks. r=Pike,ted,a=bustage-fix
toolkit/locales/l10n.mk
--- a/toolkit/locales/l10n.mk
+++ b/toolkit/locales/l10n.mk
@@ -121,16 +121,20 @@ endif
 	cd $(DIST)/l10n-stage && \
 	  $(UNMAKE_PACKAGE)
 	$(MAKE) clobber-zip AB_CD=en-US
 
 
 unpack: $(STAGEDIST)
 	@echo done unpacking
 
+# The path to the object dir for the mozilla-central build system,
+# may be overridden if necessary.
+MOZDEPTH ?= $(DEPTH)
+
 repackage-zip: UNPACKAGE="$(ZIP_IN)"
 repackage-zip:
 # call a hook for apps to put their uninstall helper.exe into the package
 	$(UNINSTALLER_PACKAGE_HOOK)
 # 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 - )