mozilla-inbound: changeset 107634:2fead827aff0f4774d7ae5f51bb67fb91a8d6c69

author	Mike Hommey <mh+mozilla@glandium.org>
	Thu, 20 Sep 2012 19:36:08 +0200
changeset 107634	2fead827aff0f4774d7ae5f51bb67fb91a8d6c69
parent 107633	b7a70792a39d5fc023fd1bde84eec7031547f89a
child 107635	5543e5e5bcd3bf0eef53d6c97c1e023b9cb87b51
push id	15143
push user	mh@glandium.org
push date	Thu, 20 Sep 2012 17:38:21 +0000
treeherder	mozilla-inbound@5543e5e5bcd3 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	ted
bugs	790655
milestone	18.0a1
first release with	nightly linux32 48c4938eaf57 / 18.0a1 / 20120921030601 / files nightly linux64 48c4938eaf57 / 18.0a1 / 20120921030601 / files nightly mac 48c4938eaf57 / 18.0a1 / 20120921030601 / files nightly win32 48c4938eaf57 / 18.0a1 / 20120921030601 / files nightly win64 48c4938eaf57 / 18.0a1 / 20120921030601 / files
last release without	nightly linux32 1e56d3016820 / 18.0a1 / 20120920030543 / files nightly linux64 1e56d3016820 / 18.0a1 / 20120920030543 / files nightly mac 1e56d3016820 / 18.0a1 / 20120920030543 / files nightly win32 1e56d3016820 / 18.0a1 / 20120920030543 / files nightly win64 1e56d3016820 / 18.0a1 / 20120920030543 / files

--- a/browser/locales/Makefile.in
+++ b/browser/locales/Makefile.in
@@ -231,13 +231,16 @@ merge-%:
 ifdef LOCALE_MERGEDIR
 	$(RM) -rf $(LOCALE_MERGEDIR)
 	MACOSX_DEPLOYMENT_TARGET= compare-locales -m $(LOCALE_MERGEDIR) $(srcdir)/l10n.ini $(L10NBASEDIR) $*
 endif
 	@echo
 
 # test target, depends on make package
 # try to repack x-test, with just toolkit/defines.inc being there
+l10n-check:: INNER_UNMAKE_PACKAGE=true
 l10n-check::
 	$(RM) -rf x-test
 	$(NSINSTALL) -D x-test/toolkit
 	echo "#define MOZ_LANG_TITLE Just testing" > x-test/toolkit/defines.inc
 	$(MAKE) installers-x-test L10NBASEDIR="$(PWD)" LOCALE_MERGEDIR="$(PWD)/mergedir"
+	cd $(DIST)/l10n-stage && $(UNMAKE_PACKAGE)
+	cd $(DIST)/l10n-stage && test $$(cat $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/update.locale) = x-test