Bustage fix for comm-central apps after bug 481815 - use MOZILLA_DIR not topsrcdir. rs=kheuy
authorMark Banner <bugzilla@standard8.plus.com>
Thu, 08 Dec 2011 18:06:44 +0000
changeset 82256 5c8405e6226eda1629be41b51a044eab8ac52740
parent 82255 98db2311a44ca0df3e0174b7761609ee77fe2fd6
child 82269 9e7239c0f557ddafdca5bcf9598294c52f42d08d
child 82987 0c3d8799ca895c1f4fd2912a8d719d2da776bc1f
child 105392 046f56a7f5bf81ca094d3b950717186195dd53c8
push id21588
push userbugzilla@standard8.plus.com
push dateThu, 08 Dec 2011 18:07:23 +0000
treeherdermozilla-central@5c8405e6226e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskheuy
bugs481815
milestone11.0a1
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
Bustage fix for comm-central apps after bug 481815 - use MOZILLA_DIR not topsrcdir. rs=kheuy
toolkit/locales/l10n.mk
toolkit/mozapps/installer/windows/nsis/makensis.mk
--- a/toolkit/locales/l10n.mk
+++ b/toolkit/locales/l10n.mk
@@ -98,17 +98,17 @@ clobber-%:
 PACKAGER_NO_LIBS = 1
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 STAGEDIST = $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_DIR)/$(_APPNAME)/Contents/MacOS
 else
 STAGEDIST = $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_DIR)
 endif
 
-include $(topsrcdir)/toolkit/mozapps/installer/signing.mk
+include $(MOZILLA_DIR)/toolkit/mozapps/installer/signing.mk
 include $(MOZILLA_DIR)/toolkit/mozapps/installer/packager.mk
 
 $(STAGEDIST): AB_CD:=en-US
 $(STAGEDIST): UNPACKAGE=$(call ESCAPE_SPACE,$(ZIP_IN))
 $(STAGEDIST): $(call ESCAPE_SPACE,$(ZIP_IN))
 # only mac needs to remove the parent of STAGEDIST...
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 	$(RM) -r -v $(DIST)/l10n-stage
--- a/toolkit/mozapps/installer/windows/nsis/makensis.mk
+++ b/toolkit/mozapps/installer/windows/nsis/makensis.mk
@@ -36,17 +36,17 @@
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
 ifndef CONFIG_DIR
 $(error CONFIG_DIR must be set before including makensis.mk)
 endif
 
-include $(topsrcdir)/toolkit/mozapps/installer/signing.mk
+include $(MOZILLA_DIR)/toolkit/mozapps/installer/signing.mk
 
 ABS_CONFIG_DIR := $(shell pwd)/$(CONFIG_DIR)
 
 SFX_MODULE ?= $(error SFX_MODULE is not defined)
 
 TOOLKIT_NSIS_FILES = \
 	common.nsh \
 	locales.nsi \