]>
Commit | Line | Data |
---|---|---|
fac7e24d JB |
1 | --- mozilla/mail/app/Makefile.in.orig 2012-02-16 11:18:22.000000000 +0100 |
2 | +++ mozilla/mail/app/Makefile.in 2012-03-22 16:43:33.608721456 +0100 | |
3 | @@ -44,5 +44,7 @@ | |
4 | ||
5 | AB_CD = $(MOZ_UI_LOCALE) | |
6 | ||
7 | +DIST_FILES = application.ini | |
8 | + | |
9 | GRE_MILESTONE = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build Milestone) | |
10 | GRE_BUILDID = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build BuildID) | |
11 | @@ -79,6 +81,7 @@ | |
12 | $(srcdir)/profile/channel-prefs.js \ | |
13 | $(NULL) | |
14 | ||
15 | +ifndef LIBXUL_SDK | |
16 | ifneq (,$(filter OS2 Darwin WINCE WINNT,$(OS_ARCH))) | |
17 | PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX) | |
18 | else | |
19 | @@ -88,8 +91,6 @@ | |
20 | ||
21 | CPPSRCS = nsMailApp.cpp | |
22 | ||
23 | -DIST_FILES = application.ini | |
24 | - | |
25 | LOCAL_INCLUDES += \ | |
26 | -I$(MOZILLA_SRCDIR)/toolkit/xre \ | |
27 | -I$(MOZILLA_SRCDIR)/xpcom/base \ | |
28 | @@ -116,6 +117,8 @@ | |
29 | LIBS += $(MOZ_DBUS_GLIB_LIBS) | |
30 | endif | |
31 | ||
32 | +endif # LIBXUL_SDK | |
33 | + | |
34 | ifndef MOZ_WINCONSOLE | |
35 | ifdef MOZ_DEBUG | |
36 | MOZ_WINCONSOLE = 1 | |
37 | @@ -233,6 +236,11 @@ | |
38 | $(SYSINSTALL) $(IFLAGS1) $(DIST)/branding/default* $(DESTDIR)$(mozappdir)/chrome/icons/default | |
39 | endif | |
40 | ||
41 | +ifdef LIBXUL_SDK | |
42 | +libs:: | |
73d54cb2 | 43 | + cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/$(MOZ_APP_NAME)-bin$(BIN_SUFFIX) |
fac7e24d JB |
44 | +endif |
45 | + | |
46 | ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH))) | |
47 | ifneq (,$(filter-out Darwin,$(OS_ARCH))) | |
48 | $(MOZ_APP_NAME):: $(MOZILLA_DIR)/build/unix/mozilla.in $(GLOBAL_DEPS) $(DEPTH)/config/autoconf.mk |