Move mail back to topsrcdir

calendar/lightning/build/universal.mk

@@ -17,7 +17,7 @@ DEPTH = $(OBJDIR)
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/platform/toolkit/mozapps/installer/package-name.mk
 
-THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/projects/mail/config/version.txt)
+THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version.txt)
 LIGHTNING_VERSION := $(shell $(PYTHON) $(topsrcdir)/calendar/lightning/build/makeversion.py $(word 1,$(MOZ_PKG_VERSION) $(THUNDERBIRD_VERSION)))
 XPI_PKGNAME = lightning-$(LIGHTNING_VERSION).$(AB_CD).$(MOZ_PKG_PLATFORM)
 

calendar/lightning/versions.mk

@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # Lighting version number
-THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/projects/mail/config/version.txt)
+THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version.txt)
 SEAMONKEY_VERSION := "2.49"
 
 ifdef MOZ_SUITE

calendar/timezones/Makefile.in

@@ -4,7 +4,7 @@
 
 XPI_PKGNAME = calendar-timezones-$(TIMEZONES_VERSION)
 
-THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/projects/mail/config/version.txt)
+THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version.txt)
 SEAMONKEY_VERSION := "2.49"
 CALENDAR_VERSION := $(shell $(PYTHON) $(topsrcdir)/calendar/lightning/build/makeversion.py $(word 1,$(MOZ_PKG_VERSION) $(THUNDERBIRD_VERSION)))
 TIMEZONES_VERSION := $(shell $(PYTHON) $(srcdir)/version.py)

mail/app.mozbuild

@@ -4,7 +4,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 if not CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
-    DIRS += ['/projects/mail/components']
+    DIRS += ['/mail/components']
 
 include('/communicator/communicator.mozbuild')
 
@@ -15,4 +15,4 @@ DIRS += ['/%s' % CONFIG['MOZ_BRANDING_DIRECTORY']]
 
 # Never add tier dirs after mail because they apparently won't get
 # packaged properly on Mac.
-DIRS += ['/projects/mail']
+DIRS += ['/mail']

mail/base/content/mailWindowOverlay.xul

@@ -2937,7 +2937,7 @@
 
 #ifdef XP_MACOSX
 <!-- Mac window menu -->
-#include ../../../../platform/toolkit/content/macWindowMenu.inc
+#include ../../../platform/toolkit/content/macWindowMenu.inc
 #endif
 
     <!-- Help -->