diff --git a/accessible/build/Makefile.in b/accessible/build/Makefile.in
index 1a247b62674..791550f1751 100644
--- a/accessible/build/Makefile.in
+++ b/accessible/build/Makefile.in
@@ -64,13 +64,13 @@ CPPSRCS		= nsAccessibilityFactory.cpp
 LOCAL_INCLUDES	= -I$(srcdir)/../src
 
 SHARED_LIBRARY_LIBS = \
-	$(DIST)/lib/$(LIB_PREFIX)accessibility_base_s.$(LIB_SUFFIX) \
-	$(DIST)/lib/$(LIB_PREFIX)accessibility_html_s.$(LIB_SUFFIX) \
-	$(DIST)/lib/$(LIB_PREFIX)accessibility_toolkit_s.$(LIB_SUFFIX) \
+	../src/base/$(LIB_PREFIX)accessibility_base_s.$(LIB_SUFFIX) \
+	../src/html/$(LIB_PREFIX)accessibility_html_s.$(LIB_SUFFIX) \
+	../src/$(LIB_PREFIX)accessibility_toolkit_s.$(LIB_SUFFIX) \
 	$(NULL)
 
 ifdef MOZ_XUL
-SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)accessibility_xul_s.$(LIB_SUFFIX)
+SHARED_LIBRARY_LIBS += ../src/xul/$(LIB_PREFIX)accessibility_xul_s.$(LIB_SUFFIX)
 endif
 
 EXTRA_DSO_LIBS = \
diff --git a/accessible/src/Makefile.in b/accessible/src/Makefile.in
index 972d9385bbf..31a4e05bb6a 100644
--- a/accessible/src/Makefile.in
+++ b/accessible/src/Makefile.in
@@ -44,19 +44,21 @@ VPATH = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-DIRS += atk
+PLATFORM_DIR = atk
 else
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-DIRS += msaa
+PLATFORM_DIR = msaa
 else
 ifeq ($(MOZ_WIDGET_TOOLKIT),mac)
-DIRS += mac
+PLATFORM_DIR += mac
 else
-DIRS += other
+PLATFORM_DIR += other
 endif
 endif
 endif
 
+DIRS += $(PLATFORM_DIR)
+
 DIRS += \
   base \
   html \
@@ -68,3 +70,5 @@ endif
 
 include $(topsrcdir)/config/rules.mk
 
+libs::
+	$(NSINSTALL) $(PLATFORM_DIR)/$(LIB_PREFIX)accessibility_toolkit_s.$(LIB_SUFFIX) .
diff --git a/browser/components/build/Makefile.in b/browser/components/build/Makefile.in
index 10b6db870ca..a2d1491cced 100644
--- a/browser/components/build/Makefile.in
+++ b/browser/components/build/Makefile.in
@@ -52,11 +52,11 @@ OS_LIBS += $(call EXPAND_LIBNAME,version)
 endif
 
 SHARED_LIBRARY_LIBS = \
-	$(DIST)/lib/$(LIB_PREFIX)migration_s.$(LIB_SUFFIX) \
+	../migration/src/$(LIB_PREFIX)migration_s.$(LIB_SUFFIX) \
 	$(NULL)
 
 ifneq (,$(filter windows mac cocoa gtk2, $(MOZ_WIDGET_TOOLKIT)))
-SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)shellservice_s.$(LIB_SUFFIX)
+SHARED_LIBRARY_LIBS += ../shell/src/$(LIB_PREFIX)shellservice_s.$(LIB_SUFFIX)
 endif
 
 ifdef MOZ_PLACES
@@ -76,10 +76,10 @@ REQUIRES += \
             $(NULL)
 
 LOCAL_INCLUDES += -I$(srcdir)/../places/src
-SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)places_s.$(LIB_SUFFIX)
+SHARED_LIBRARY_LIBS += ../places/src/$(LIB_PREFIX)places_s.$(LIB_SUFFIX)
 else
 SHARED_LIBRARY_LIBS += \
-	$(DIST)/lib/$(LIB_PREFIX)bookmarks_s.$(LIB_SUFFIX) \
+	../bookmarks/src/$(LIB_PREFIX)bookmarks_s.$(LIB_SUFFIX) \
 	$(NULL)
 endif
 
@@ -98,7 +98,7 @@ EXTRA_DSO_LDOPTS += \
 	$(NULL)
 
 ifdef MOZ_PLACES
-EXTRA_DSO_LDOPTS += $(DIST)/lib/$(LIB_PREFIX)morkreader_s.$(LIB_SUFFIX)
+EXTRA_DSO_LDOPTS += $(DEPTH)/db/morkreader/$(LIB_PREFIX)morkreader_s.$(LIB_SUFFIX)
 endif
 
 # Need to link to CoreFoundation for Mac Migrators (PList reading code)
diff --git a/db/mork/build/Makefile.in b/db/mork/build/Makefile.in
index a65b5af6946..95c4667b2e3 100644
--- a/db/mork/build/Makefile.in
+++ b/db/mork/build/Makefile.in
@@ -61,7 +61,7 @@ EXPORTS		= \
 		nsIMdbFactoryFactory.h \
 		$(NULL)
 
-SHARED_LIBRARY_LIBS = $(DIST)/lib/$(LIB_PREFIX)msgmork_s.$(LIB_SUFFIX)
+SHARED_LIBRARY_LIBS = ../src/$(LIB_PREFIX)msgmork_s.$(LIB_SUFFIX)
 
 EXTRA_DSO_LDOPTS = \
 		$(LIBS_DIR) \
diff --git a/docshell/build/Makefile.in b/docshell/build/Makefile.in
index 912158851d6..3eef8e060ff 100644
--- a/docshell/build/Makefile.in
+++ b/docshell/build/Makefile.in
@@ -99,11 +99,11 @@ CPPSRCS		= \
 		$(NULL)
 
 SHARED_LIBRARY_LIBS= \
-		$(DIST)/lib/$(LIB_PREFIX)basedocshell_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/$(LIB_PREFIX)uriloaderbase_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/$(LIB_PREFIX)exthandler_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/$(LIB_PREFIX)prefetch_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/$(LIB_PREFIX)shistory_s.$(LIB_SUFFIX) \
+		../base/$(LIB_PREFIX)basedocshell_s.$(LIB_SUFFIX) \
+		$(DEPTH)/uriloader/base/$(LIB_PREFIX)uriloaderbase_s.$(LIB_SUFFIX) \
+		$(DEPTH)/uriloader/exthandler/$(LIB_PREFIX)exthandler_s.$(LIB_SUFFIX) \
+		$(DEPTH)/uriloader/prefetch/$(LIB_PREFIX)prefetch_s.$(LIB_SUFFIX) \
+		../shistory/src/$(LIB_PREFIX)shistory_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS= \