mozilla-inbound: changeset 91610:3f872c75a08c3a9fe4b78c7fc29e771acc0aeb7c

author	Benjamin Smedberg <benjamin@smedbergs.us>
	Fri, 13 Apr 2012 13:27:24 -0400
changeset 91610	3f872c75a08c3a9fe4b78c7fc29e771acc0aeb7c
parent 91609	a3f9ee8bb74519377646e8b3b174d75161beca11
child 91611	a45e6af2cc324324d3bd6f0aac63f85da027e90c
push id	8298
push user	bsmedberg@mozilla.com
push date	Fri, 13 Apr 2012 17:31:24 +0000
treeherder	mozilla-inbound@3f872c75a08c [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	Mossop
bugs	743560
milestone	14.0a1
first release with	nightly linux32 0d871550085e / 14.0a1 / 20120415030725 / files nightly linux64 0d871550085e / 14.0a1 / 20120415030725 / files nightly mac 0d871550085e / 14.0a1 / 20120415030725 / files nightly win32 0d871550085e / 14.0a1 / 20120415030725 / files nightly win64 0d871550085e / 14.0a1 / 20120415030725 / files
last release without	nightly linux32 10622eaff4fc / 14.0a1 / 20120413030727 / files nightly linux64 10622eaff4fc / 14.0a1 / 20120413030727 / files nightly mac 10622eaff4fc / 14.0a1 / 20120413030727 / files nightly win32 10622eaff4fc / 14.0a1 / 20120413030727 / files nightly win64 8eb367e5b053 / 14.0a1 / 20120412030726 / files

--- a/xulrunner/installer/Makefile.in
+++ b/xulrunner/installer/Makefile.in
@@ -43,19 +43,25 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 NO_PKG_FILES = \
 	xulrunner-config \
 	regchrome* \
 	regxpcom* \
+	$(NULL)
+
+# We want xpcshell and run-mozilla in the SDK but not in the binary package.
+ifndef STAGE_SDK
+NO_PKG_FILES += \
 	xpcshell* \
 	run-mozilla* \
 	$(NULL)
+endif
 
 # If we're on mac, we don't want an end-user-facing DMG, we want a .tar.bz2
 # which developers then use to package their application.
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 MOZ_PKG_FORMAT = BZ2
 _APPNAME = XUL.framework
 _BINPATH = /$(_APPNAME)/Versions/Current