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