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
authorRobert Kaiser <kairo@kairo.at>
Thu, 24 Jul 2008 21:38:53 +0200
changeset 8 485b2f3d81d73daef4083727e12cd3ac0a793949
parent 7 2066395d65e6e83e8114c4cadda347ff18aca4ce
child 9 cfc7ac2a44002a2478edafb9cd619212d07d2b03
push idunknown
push userunknown
push dateunknown
reviewersStandard8, Standard8
bugs447636
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
mail/build.mk
suite/build.mk
--- 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