--- a/calendar/lightning/build/universal.mk
+++ b/calendar/lightning/build/universal.mk
@@ -1,17 +1,17 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ifndef OBJDIR
 OBJDIR_ARCH_1 = $(MOZ_OBJDIR)/$(firstword $(MOZ_BUILD_PROJECTS))
 OBJDIR_ARCH_2 = $(MOZ_OBJDIR)/$(word 2,$(MOZ_BUILD_PROJECTS))
-DIST_ARCH_1 = $(OBJDIR_ARCH_1)/mozilla/dist
-DIST_ARCH_2 = $(OBJDIR_ARCH_2)/mozilla/dist
+DIST_ARCH_1 = $(OBJDIR_ARCH_1)/dist
+DIST_ARCH_2 = $(OBJDIR_ARCH_2)/dist
 DIST_UNI = $(DIST_ARCH_1)/universal
 OBJDIR = $(OBJDIR_ARCH_1)
 endif
 
 topsrcdir = $(TOPSRCDIR)
 DEPTH = $(OBJDIR)
 
 include $(DEPTH)/config/autoconf.mk

--- a/im/app.mozbuild
+++ b/im/app.mozbuild
@@ -5,15 +5,15 @@
 app_libxul_dirs = []
 app_libxul_static_dirs = []
 
 if not CONFIG['LIBXUL_SDK']:
     include('/toolkit/toolkit.mozbuild')
 
 add_tier_dir('app', CONFIG['MOZ_BRANDING_DIRECTORY'])
 
-add_tier_dir('app', '../chat')
+add_tier_dir('app', 'chat')
 
 # Ensure extensions are built after chat/ so purplexpcom can build.
 if CONFIG['MOZ_EXTENSIONS']:
     add_tier_dir('app', 'extensions')
 
-add_tier_dir('app', '../im')
+add_tier_dir('app', 'im')

--- a/mail/app.mozbuild
+++ b/mail/app.mozbuild
@@ -1,35 +1,35 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 app_libxul_dirs = []
 app_libxul_static_dirs = []
 
-include('../bridge/bridge.mozbuild')
+include('/mailnews/mailnews.mozbuild')
 
 if not CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     app_libxul_dirs = mailnews_dirs
     app_libxul_static_dirs = mailnews_static_dirs
-    app_libxul_dirs += ['../mail/components']
+    app_libxul_dirs += ['mail/components']
 
 if not CONFIG['LIBXUL_SDK']:
     include('/toolkit/toolkit.mozbuild')
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     add_tier_dir('app', mailnews_static_dirs, static=True)
     add_tier_dir('app', mailnews_dirs)
 
 if CONFIG['MOZ_EXTENSIONS']:
     add_tier_dir('app', 'extensions')
 
 add_tier_dir('app', CONFIG['MOZ_BRANDING_DIRECTORY'])
 
 if CONFIG['MOZ_COMPOSER']:
-    add_tier_dir('app', '../editor/ui')
+    add_tier_dir('app', 'editor/ui')
 
 if CONFIG['MOZ_CALENDAR']:
-    add_tier_dir('app', '../calendar/lightning')
+    add_tier_dir('app', 'calendar/lightning')
 
-add_tier_dir('app', '../chat')
-add_tier_dir('app', '../mail')
+add_tier_dir('app', 'chat')
+add_tier_dir('app', 'mail')

--- a/mail/configure.in
+++ b/mail/configure.in
@@ -19,22 +19,17 @@ fi
 if test "$OS_ARCH" != "WINNT"; then
   MOZ_MOVEMAIL=1
   HAVE_MOVEMAIL=1
   AC_DEFINE(HAVE_MOVEMAIL)
 fi
 AC_SUBST(MOZ_MOVEMAIL)
 
 dnl Get other versions (for the calendar plugin)
-if test "$COMM_BUILD" = "1"; then
-  commdir=$topsrcdir
-else
-  commdir=$topsrcdir/..
-fi
-SEAMONKEY_VERSION=`cat $commdir/suite/config/version.txt`
+SEAMONKEY_VERSION=`cat $topsrcdir/suite/config/version.txt`
 AC_SUBST(SEAMONKEY_VERSION)
 
 dnl =========================================================
 dnl = Lightning extension
 dnl =========================================================
 MOZ_ARG_ENABLE_BOOL(calendar,
 [  --enable-calendar      Enable building of the Lightning calendar extension],
     MOZ_CALENDAR=1,
@@ -101,41 +96,26 @@ fi
 
 # if we're building the LDAP XPCOM component, we need to build
 # the c-sdk first.
 if test -n "$COMPILE_ENVIRONMENT" -a -n "$MOZ_LDAP_XPCOM"; then
     # Save configure args so we can restore them after configuring LDAP.
     _save_ac_configure_args="$ac_configure_args"
     ac_configure_args="$_SUBDIR_CONFIG_ARGS"
 
-    mkdir -p ../ldap/sdks/c-sdk/ldap
-    # these subdirs may not yet have been created in the build tree.
-    # don't use the "-p" switch to mkdir, since not all platforms have it
-    if test ! -d "ldap/sdks/c-sdk/ldap"; then
-        if test ! -d "ldap/sdks/c-sdk"; then
-            if test ! -d "ldap/sdks"; then
-                if test ! -d "ldap"; then
-                    mkdir "ldap"
-                fi
-                mkdir "ldap/sdks"
-            fi
-            mkdir "ldap/sdks/c-sdk"
-        fi
-        mkdir "ldap/sdks/c-sdk/ldap"
-    fi
-
+    mkdir -p ldap/sdks/c-sdk/ldap
     ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/dist --with-dist-prefix=$MOZ_BUILD_ROOT/dist --without-nss --with-mozilla"
     if test -n "$HAVE_64BIT_BUILD"; then
         dnl A 64-bit OS was (auto-)detected: (explicitly) enable 64-bit support.
         ac_configure_args="$ac_configure_args --enable-64bit"
     fi
     if test -n "$LIBXUL_SDK"; then
         ac_configure_args="$ac_configure_args --with-nspr=$LIBXUL_DIST"
     fi
 
     dnl The cache file needs to be an absolute path to work properly.
     cache_file_base=`dirname $cache_file`
     cache_file=`cd $cache_file_base && pwd`/`basename $cache_file`
 
-    AC_OUTPUT_SUBDIRS(../ldap/sdks/c-sdk)
+    AC_OUTPUT_SUBDIRS(ldap/sdks/c-sdk)
     ac_configure_args="$_save_ac_configure_args"
 fi # COMPILE_ENVIRONMENT && MOZ_LDAP_XPCOM
 

rename from bridge/bridge.mozbuild
rename to mailnews/mailnews.mozbuild
--- a/bridge/bridge.mozbuild
+++ b/mailnews/mailnews.mozbuild
@@ -2,16 +2,16 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 mailnews_dirs = []
 mailnews_static_dirs = []
 
 if CONFIG['MOZ_LDAP_XPCOM']:
-    mailnews_dirs += ['../ldap']
-    mailnews_dirs += ['../ldap/xpcom']
+    mailnews_dirs += ['ldap']
+    mailnews_dirs += ['ldap/xpcom']
 
 if CONFIG['MOZ_MORK']:
-    mailnews_dirs += ['../db']
+    mailnews_dirs += ['db']
 
-mailnews_dirs += ['../mailnews']
+mailnews_dirs += ['mailnews']
 

--- a/suite/app.mozbuild
+++ b/suite/app.mozbuild
@@ -1,33 +1,33 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 app_libxul_dirs = []
 app_libxul_static_dirs = []
 
-include('../bridge/bridge.mozbuild')
+include('/mailnews/bridge.mozbuild')
 
 if not CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     app_libxul_dirs = mailnews_dirs
     app_libxul_static_dirs = mailnews_static_dirs
 
 if not CONFIG['LIBXUL_SDK']:
     include('/toolkit/toolkit.mozbuild')
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     add_tier_dir('app', mailnews_static_dirs, static=True)
     add_tier_dir('app', mailnews_dirs)
 
 if CONFIG['MOZ_EXTENSIONS']:
     add_tier_dir('app', 'extensions')
 
 if CONFIG['MOZ_COMPOSER']:
-    add_tier_dir('app', '../editor/ui')
+    add_tier_dir('app', 'editor/ui')
 
 add_tier_dir('app', CONFIG['MOZ_BRANDING_DIRECTORY'])
 
 if CONFIG['MOZ_CALENDAR']:
-    add_tier_dir('app', '../calendar/lightning')
+    add_tier_dir('app', 'calendar/lightning')
 
-add_tier_dir('app', ['../mozilla/xpfe/components/autocomplete', '../suite'])
+add_tier_dir('app', ['xpfe/components/autocomplete', 'suite'])

--- a/suite/configure.in
+++ b/suite/configure.in
@@ -19,22 +19,17 @@ fi
 if test "$OS_ARCH" != "WINNT"; then
   MOZ_MOVEMAIL=1
   HAVE_MOVEMAIL=1
   AC_DEFINE(HAVE_MOVEMAIL)
 fi
 AC_SUBST(MOZ_MOVEMAIL)
 
 dnl Get other versions (for the calendar plugin)
-if test "$COMM_BUILD" = "1"; then
-  commdir=$topsrcdir
-else
-  commdir=$topsrcdir/..
-fi
-THUNDERBIRD_VERSION=`cat $commdir/mail/config/version.txt`
+THUNDERBIRD_VERSION=`cat $topsrcdir/mail/config/version.txt`
 AC_SUBST(THUNDERBIRD_VERSION)
 
 dnl =========================================================
 dnl = Lightning extension
 dnl =========================================================
 MOZ_ARG_ENABLE_BOOL(calendar,
 [  --enable-calendar      Enable building of the Lightning calendar extension],
     MOZ_CALENDAR=1,
@@ -101,41 +96,26 @@ fi
 
 # if we're building the LDAP XPCOM component, we need to build
 # the c-sdk first.
 if test -n "$COMPILE_ENVIRONMENT" -a -n "$MOZ_LDAP_XPCOM"; then
     # Save configure args so we can restore them after configuring LDAP.
     _save_ac_configure_args="$ac_configure_args"
     ac_configure_args="$_SUBDIR_CONFIG_ARGS"
 
-    mkdir -p ../ldap/sdks/c-sdk/ldap
-    # these subdirs may not yet have been created in the build tree.
-    # don't use the "-p" switch to mkdir, since not all platforms have it
-    if test ! -d "ldap/sdks/c-sdk/ldap"; then
-        if test ! -d "ldap/sdks/c-sdk"; then
-            if test ! -d "ldap/sdks"; then
-                if test ! -d "ldap"; then
-                    mkdir "ldap"
-                fi
-                mkdir "ldap/sdks"
-            fi
-            mkdir "ldap/sdks/c-sdk"
-        fi
-        mkdir "ldap/sdks/c-sdk/ldap"
-    fi
-
+    mkdir -p ldap/sdks/c-sdk/ldap
     ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/dist --with-dist-prefix=$MOZ_BUILD_ROOT/dist --without-nss --with-mozilla"
     if test -n "$HAVE_64BIT_BUILD"; then
         dnl A 64-bit OS was (auto-)detected: (explicitly) enable 64-bit support.
         ac_configure_args="$ac_configure_args --enable-64bit"
     fi
     if test -n "$LIBXUL_SDK"; then
         ac_configure_args="$ac_configure_args --with-nspr=$LIBXUL_DIST"
     fi
 
     dnl The cache file needs to be an absolute path to work properly.
     cache_file_base=`dirname $cache_file`
     cache_file=`cd $cache_file_base && pwd`/`basename $cache_file`
 
-    AC_OUTPUT_SUBDIRS(../ldap/sdks/c-sdk)
+    AC_OUTPUT_SUBDIRS(ldap/sdks/c-sdk)
     ac_configure_args="$_save_ac_configure_args"
 fi # COMPILE_ENVIRONMENT && MOZ_LDAP_XPCOM