Bug 340437 suiterunner installer packaging fails on Windows (tpol tinderbox). r=benjamin,sr=Neil

toolkit/mozapps/Makefile.in

@@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk
 
 DIRS = downloads extensions update xpinstall plugins
 
+# XXX SUITE doesn't want to build the toolkit installer yet
+ifndef MOZ_SUITE
 # The installer is built during the packaging phase, but the uninstaller needs
 # to be built earlier.
 ifdef MOZ_INSTALLER
@@ -51,5 +53,6 @@ ifeq ($(OS_ARCH),WINNT)
 DIRS += installer/windows/wizard/uninstall
 endif
 endif
+endif
 
 include $(topsrcdir)/config/rules.mk

xpinstall/wizard/windows/Makefile.in

@@ -48,7 +48,15 @@ ifeq ($(OS),Windows_NT)
 DIRS	+= nsztool
 endif
 
+# XXX Suite still wants the xpfe installer at the moment
 ifndef MOZ_XUL_APP
+BUILD_SETUP=1
+endif
+ifdef MOZ_SUITE
+BUILD_SETUP=1
+endif
+
+ifdef BUILD_SETUP
 DIRS    += \
 	uninstall \
 	setuprsc \