bug 447636 - build editor/ui with Mozilla build system as long as it lives in mozilla/, r=Standard8, a=Standard8 for checkin into closed comm-central tree
--- a/mail/build.mk
+++ b/mail/build.mk
@@ -38,16 +38,18 @@
ifndef COMM_BUILD # Mozilla Makefile
ifndef LIBXUL_SDK
include $(topsrcdir)/toolkit/toolkit-tiers.mk
endif
TIERS += app
+tier_app_dirs += editor/ui
+
ifdef MOZ_CALENDAR
MOZ_EXTENSIONS += webdav
endif
ifdef MOZ_EXTENSIONS
tier_app_dirs += extensions
endif
@@ -62,17 +64,16 @@ endif
ifdef MOZ_BRANDING_DIRECTORY
tier_app_dirs += $(MOZ_BRANDING_DIRECTORY)
else
tier_app_dirs += mail/branding/nightly
endif
tier_app_dirs += \
- mozilla/editor/ui \
mailnews \
$(NULL)
ifdef MOZ_CALENDAR
tier_app_dirs += calendar/lightning
endif
tier_app_dirs += \
--- a/suite/build.mk
+++ b/suite/build.mk
@@ -38,16 +38,20 @@
ifndef COMM_BUILD # Mozilla Makefile
ifndef LIBXUL_SDK
include $(topsrcdir)/toolkit/toolkit-tiers.mk
endif
TIERS += app
+ifdef MOZ_COMPOSER
+tier_app_dirs += editor/ui
+endif
+
ifdef MOZ_CALENDAR
MOZ_EXTENSIONS += webdav
endif
ifdef MOZ_EXTENSIONS
tier_app_dirs += extensions
endif
@@ -59,20 +63,16 @@ ifdef MOZ_LDAP_XPCOM
tier_app_staticdirs += directory/c-sdk
tier_app_dirs += directory/xpcom
endif
ifdef MOZ_BRANDING_DIRECTORY
tier_app_dirs += $(MOZ_BRANDING_DIRECTORY)
endif
-ifdef MOZ_COMPOSER
-tier_app_dirs += mozilla/editor/ui
-endif
-
ifdef MOZ_MAIL_NEWS
tier_app_dirs += mailnews
endif
ifdef MOZ_CALENDAR
tier_app_dirs += calendar/lightning
endif
