---- mozilla/mail/app/Makefile.in.orig 2012-02-16 11:18:22.000000000 +0100
-+++ mozilla/mail/app/Makefile.in 2012-03-22 16:43:33.608721456 +0100
-@@ -44,5 +44,7 @@
+--- mozilla/mail/app/Makefile.in.orig 2012-04-28 21:31:30.000000000 +0200
++++ mozilla/mail/app/Makefile.in 2012-05-29 20:12:43.887999371 +0200
+@@ -44,6 +44,8 @@
AB_CD = $(MOZ_UI_LOCALE)
+
GRE_MILESTONE = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build Milestone)
GRE_BUILDID = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build BuildID)
+
@@ -79,6 +81,7 @@
$(srcdir)/profile/channel-prefs.js \
$(NULL)
+ifndef LIBXUL_SDK
- ifneq (,$(filter OS2 Darwin WINCE WINNT,$(OS_ARCH)))
+ ifneq (,$(filter OS2 Darwin WINNT,$(OS_ARCH)))
PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
else
@@ -88,8 +91,6 @@