diff --git a/profile/Acct/Makefile.in b/profile/Acct/Makefile.in
index 673a351912d6..4dbf19c64737 100644
--- a/profile/Acct/Makefile.in
+++ b/profile/Acct/Makefile.in
@@ -13,22 +13,19 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
-# 
+#
 
-DEPTH	= ../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME=profile
-IS_COMPONENT=1
+LIBRARY_NAME	= profile
+IS_COMPONENT	= 1
 
-CPPSRCS = \
-	nsAccount.cpp \
-	$(NULL)
-
-include $(topsrcdir)/config/config.mk
+CPPSRCS		= nsAccount.cpp
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/profile/Makefile.in b/profile/Makefile.in
index 52414402619a..5d61a31e96a7 100644
--- a/profile/Makefile.in
+++ b/profile/Makefile.in
@@ -13,17 +13,16 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
-# 
+#
 
-DEPTH	= ..
+DEPTH		= ..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS	= public src resources defaults idlservices pref-migrator
-
-include $(topsrcdir)/config/config.mk
+DIRS		= public src resources defaults idlservices pref-migrator
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/profile/defaults/Makefile.in b/profile/defaults/Makefile.in
index 6827e2013ee6..ffd7e6e65848 100644
--- a/profile/defaults/Makefile.in
+++ b/profile/defaults/Makefile.in
@@ -22,12 +22,8 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-FILES		= bookmarks.html
-
-FILES		:= $(addprefix $(srcdir)/, $(FILES))
-
 include $(topsrcdir)/config/rules.mk
 
 install::
-	$(INSTALL) $(FILES) $(DIST)/bin/defaults
+	$(INSTALL) $(srcdir)/bookmarks.html $(DIST)/bin/defaults
 
diff --git a/profile/idlservices/Makefile.in b/profile/idlservices/Makefile.in
index 5656295c0939..77406fb4437c 100644
--- a/profile/idlservices/Makefile.in
+++ b/profile/idlservices/Makefile.in
@@ -22,8 +22,8 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= profileservices
 MODULE		= profileservices
+LIBRARY_NAME	= profileservices
 IS_COMPONENT	= 1
 
 REQUIRES	= profileservices raptor xpcom
diff --git a/profile/pref-migrator/Makefile.in b/profile/pref-migrator/Makefile.in
index 623cd19b50fd..9fbf60f8b253 100644
--- a/profile/pref-migrator/Makefile.in
+++ b/profile/pref-migrator/Makefile.in
@@ -13,17 +13,16 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
-# 
+#
 
-DEPTH	= ../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS=public src resources
+DIRS		= public src resources
 
-include $(topsrcdir)/config/config.mk
+include $(topsrcdir)/config/rules.mk
 
-include $(topsrcdir)/config/rules.mk  
diff --git a/profile/pref-migrator/public/Makefile.in b/profile/pref-migrator/public/Makefile.in
index e7876d5002ca..f2bf5733afd9 100644
--- a/profile/pref-migrator/public/Makefile.in
+++ b/profile/pref-migrator/public/Makefile.in
@@ -17,20 +17,21 @@
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE=prefmigr
+MODULE		= prefmigr
 
-XPIDLSRCS = 	nsIPrefMigrationProgress.idl	\
-		nsIPrefMigration.idl	\
-		$(NULL)
+EXPORTS		= nsPrefMigrationCIDs.h
 
-EXPORTS=	nsPrefMigrationCIDs.h  \
+XPIDLSRCS	= \
+		nsIPrefMigrationProgress.idl \
+		nsIPrefMigration.idl \
 		$(NULL)
 
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/profile/pref-migrator/resources/Makefile.in b/profile/pref-migrator/resources/Makefile.in
index dfa83aba78a8..7964e3580925 100644
--- a/profile/pref-migrator/resources/Makefile.in
+++ b/profile/pref-migrator/resources/Makefile.in
@@ -25,10 +25,10 @@ include $(DEPTH)/config/autoconf.mk
 SAMPLES_DIR	= $(DIST)/bin/res/profile
 
 EXPORT_RESOURCE_SAMPLES = \
-	prefmProgress.xul					\
-	progress_undetermined.xul \
-	prefmProgress.css					\
-	$(NULL)
+		prefmProgress.xul \
+		progress_undetermined.xul \
+		prefmProgress.css \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
@@ -36,3 +36,4 @@ GARBAGE		+= $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES))
 
 install::
 	$(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR)
+
diff --git a/profile/pref-migrator/src/Makefile.in b/profile/pref-migrator/src/Makefile.in
index 7b59aa5de21d..e4c001149146 100644
--- a/profile/pref-migrator/src/Makefile.in
+++ b/profile/pref-migrator/src/Makefile.in
@@ -13,39 +13,39 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
-# 
+#
 
-DEPTH	= ../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME=nsprefm
+LIBRARY_NAME	= nsprefm
+IS_COMPONENT	= 1
 
-IS_COMPONENT=1
+CPPSRCS		= \
+		nsPMProgressDlg.cpp \
+		nsPrefMigration.cpp \
+		nsPrefMigrationFactory.cpp \
+		$(NULL)
 
-EXPORTS=nsPrefMigration.h	\
-	nsPrefMigrationFactory.h \
-	$(NULL)
+EXPORTS		= \
+		nsPrefMigration.h \
+		nsPrefMigrationFactory.h \
+		$(NULL)
 
-CPPSRCS = \
-	nsPMProgressDlg.cpp \
-	nsPrefMigration.cpp \
-	nsPrefMigrationFactory.cpp \
-	$(NULL)
-
-EXTRA_DSO_LDOPTS =	\
-	$(MOZ_NECKO_UTIL_LIBS) \
-	-L$(DIST)/bin	\
-	$(NSPR_LIBS)	\
-	-lxpcom			\
-	$(NULL)
+EXTRA_DSO_LDOPTS = \
+		$(MOZ_NECKO_UTIL_LIBS) \
+		-L$(DIST)/bin \
+		$(NSPR_LIBS) \
+		-lxpcom \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 ifeq ($(OS_ARCH), Linux)
-DEFINES += -D_BSD_SOURCE
+DEFINES		+= -D_BSD_SOURCE
 endif
 
diff --git a/profile/public/Makefile.in b/profile/public/Makefile.in
index 05a5ba33b0e2..2e24b7336a3e 100644
--- a/profile/public/Makefile.in
+++ b/profile/public/Makefile.in
@@ -17,18 +17,18 @@
 
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPIDLSRCS = nsIProfile.idl
-MODULE = profile
+MODULE		= profile
 
-EXPORTS	= \
-		profileSwitch.h \
-		$(NULL)
+EXPORTS		= profileSwitch.h
+
+XPIDLSRCS	= nsIProfile.idl
 
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/profile/resources/Makefile.in b/profile/resources/Makefile.in
index 9c640ac0d974..36aedd4daa88 100644
--- a/profile/resources/Makefile.in
+++ b/profile/resources/Makefile.in
@@ -40,10 +40,8 @@ FILES		= \
 		test-tab4.xul \
 		$(NULL)
 
-FILES		:= $(addprefix $(srcdir)/, $(FILES))
-
 include $(topsrcdir)/config/rules.mk
 
 install::
-	$(INSTALL) $(FILES) $(DIST)/bin/res/profile
+	$(INSTALL) $(addprefix $(srcdir)/, $(FILES)) $(DIST)/bin/res/profile
 
diff --git a/profile/src/Makefile.in b/profile/src/Makefile.in
index f3a35129d16f..73ac87c4e3ab 100644
--- a/profile/src/Makefile.in
+++ b/profile/src/Makefile.in
@@ -13,27 +13,26 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
-# 
+#
 
-DEPTH	= ../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME=profile
-IS_COMPONENT=1
+LIBRARY_NAME	= profile
+IS_COMPONENT	= 1
 
-CPPSRCS = \
-	nsProfile.cpp \
-	$(NULL)
+CPPSRCS		= nsProfile.cpp
 
-EXTRA_DSO_LDOPTS =	\
-	$(MOZ_NECKO_UTIL_LIBS) \
-	-L$(DIST)/bin \
-	-lxpcom \
-	$(NSPR_LIBS) \
-	$(NULL)
+EXTRA_DSO_LDOPTS = \
+		$(MOZ_NECKO_UTIL_LIBS) \
+		-L$(DIST)/bin \
+		-lxpcom \
+		$(NSPR_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
+