328391 .mar generation should package universal build when the build is universal. r=darin

tools/update-packaging/Makefile.in

@@ -50,7 +50,11 @@ include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
 STAGE_DIR	= $(DIST)/update
 
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifdef UNIVERSAL_BINARY
+PACKAGE_DIR	= $(DIST)/universal/$(MOZ_PKG_APPNAME)/$(MOZ_APP_DISPLAYNAME).app
+else
 PACKAGE_DIR	= $(DIST)/$(MOZ_PKG_APPNAME)/$(MOZ_APP_DISPLAYNAME).app
+endif
 else
 PACKAGE_DIR	= $(DIST)/$(MOZ_PKG_APPNAME)
 endif