projects / packages / icedove.git / blame
| Commit | Line | Data |
|---|---|---|
| fac7e24d JB |
1 | --- mozilla/config/config.mk.orig 2012-03-22 16:58:29.475414529 +0100 |
| 2 | +++ mozilla/config/config.mk 2012-03-22 19:11:29.342349305 +0100 | |
| 3 | @@ -368,7 +368,7 @@ | |
| 4 | CCC = $(CXX) | |
| 5 | PURIFY = purify $(PURIFYOPTIONS) | |
| 6 | QUANTIFY = quantify $(QUANTIFYOPTIONS) | |
| 7 | -XPIDL_LINK = $(PYTHON) $(SDK_BIN_DIR)/xpt.py link | |
| 8 | +XPIDL_LINK = $(PYTHON) $(LIBXUL_DIST)/sdk/bin/xpt.py link | |
| 9 | ||
| 10 | INCLUDES = \ | |
| 11 | $(LOCAL_INCLUDES) \ | |
| 12 | --- mozilla/mail/build.mk.orig 2012-02-16 11:18:23.000000000 +0100 | |
| 13 | +++ mozilla/mail/build.mk 2012-03-22 20:58:11.475895080 +0100 | |
| 14 | @@ -45,6 +45,9 @@ | |
| 15 | ||
| 16 | ifndef LIBXUL_SDK | |
| 17 | include $(topsrcdir)/toolkit/toolkit-tiers.mk | |
| 18 | +else | |
| 19 | +tier_app_staticdirs += $(APP_LIBXUL_STATICDIRS) | |
| 20 | +tier_app_dirs += $(APP_LIBXUL_DIRS) | |
| 21 | endif | |
| 22 | ||
| 23 | TIERS += app | |
| 24 | --- mozilla/mail/app/Makefile.in.orig 2012-02-16 11:18:22.000000000 +0100 | |
| 25 | +++ mozilla/mail/app/Makefile.in 2012-03-22 16:43:33.608721456 +0100 | |
| 26 | @@ -44,5 +44,7 @@ | |
| 27 | ||
| 28 | AB_CD = $(MOZ_UI_LOCALE) | |
| 29 | ||
| 30 | +DIST_FILES = application.ini | |
| 31 | + | |
| 32 | GRE_MILESTONE = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build Milestone) | |
| 33 | GRE_BUILDID = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build BuildID) | |
| 34 | @@ -79,6 +81,7 @@ | |
| 35 | $(srcdir)/profile/channel-prefs.js \ | |
| 36 | $(NULL) | |
| 37 | ||
| 38 | +ifndef LIBXUL_SDK | |
| 39 | ifneq (,$(filter OS2 Darwin WINCE WINNT,$(OS_ARCH))) | |
| 40 | PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX) | |
| 41 | else | |
| 42 | @@ -88,8 +91,6 @@ | |
| 43 | ||
| 44 | CPPSRCS = nsMailApp.cpp | |
| 45 | ||
| 46 | -DIST_FILES = application.ini | |
| 47 | - | |
| 48 | LOCAL_INCLUDES += \ | |
| 49 | -I$(MOZILLA_SRCDIR)/toolkit/xre \ | |
| 50 | -I$(MOZILLA_SRCDIR)/xpcom/base \ | |
| 51 | @@ -116,6 +117,8 @@ | |
| 52 | LIBS += $(MOZ_DBUS_GLIB_LIBS) | |
| 53 | endif | |
| 54 | ||
| 55 | +endif # LIBXUL_SDK | |
| 56 | + | |
| 57 | ifndef MOZ_WINCONSOLE | |
| 58 | ifdef MOZ_DEBUG | |
| 59 | MOZ_WINCONSOLE = 1 | |
| 60 | @@ -233,6 +236,11 @@ | |
| 61 | $(SYSINSTALL) $(IFLAGS1) $(DIST)/branding/default* $(DESTDIR)$(mozappdir)/chrome/icons/default | |
| 62 | endif | |
| 63 | ||
| 64 | +ifdef LIBXUL_SDK | |
| 65 | +libs:: | |
| 66 | + cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/$(MOZ_APP_NAME)-bin$(BIN_SUFFIX) | |
| 67 | +endif | |
| 68 | + | |
| 69 | ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH))) | |
| 70 | ifneq (,$(filter-out Darwin,$(OS_ARCH))) | |
| 71 | $(MOZ_APP_NAME):: $(MOZILLA_DIR)/build/unix/mozilla.in $(GLOBAL_DEPS) $(DEPTH)/config/autoconf.mk |