diff --git a/build/Makefile.in b/build/Makefile.in
index 86b1a97492b5..e07aba374b3e 100644
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "License"); you may not use this file except in
@@ -19,16 +18,14 @@
 # Reserved.
 #
 
-DEPTH = ..
+DEPTH		= ..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = unix
+DIRS		= unix
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 
-
diff --git a/build/unix/Makefile.in b/build/unix/Makefile.in
index aa321347475a..c784d30931b4 100644
--- a/build/unix/Makefile.in
+++ b/build/unix/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "License"); you may not use this file except in
@@ -19,18 +18,17 @@
 # Reserved.
 #
 
-DEPTH = ../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-include $(topsrcdir)/config/config.mk
+RUN_MOZILLA_SCRIPT = $(srcdir)/run-mozilla.sh
+
 include $(topsrcdir)/config/rules.mk
 
-RUN_MOZILLA_SCRIPT= $(srcdir)/run-mozilla.sh
-
-install:: $(PROGRAM) $(RUN_MOZILLA_SCRIPT)
+install:: $(RUN_MOZILLA_SCRIPT)
 	$(INSTALL) $(RUN_MOZILLA_SCRIPT) $(DIST)/bin
 
diff --git a/caps/Makefile.in b/caps/Makefile.in
index cea4586b06c1..25811c754218 100644
--- a/caps/Makefile.in
+++ b/caps/Makefile.in
@@ -1,4 +1,4 @@
-#!gmake
+#
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
 # compliance with the NPL.  You may obtain a copy of the NPL at
@@ -13,15 +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 = idl include src
+DIRS		= idl include src
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/caps/idl/Makefile.in b/caps/idl/Makefile.in
index d487c152aa2d..edea116af6cd 100644
--- a/caps/idl/Makefile.in
+++ b/caps/idl/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
@@ -14,21 +13,23 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1999 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
-DEPTH       = ../..
-topsrcdir   = @top_srcdir@
-srcdir      = @srcdir@
-VPATH       = @srcdir@
+DEPTH		= ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE = caps
+MODULE		= caps
 
-XPIDLSRCS =                          \
-        nsIScriptSecurityManager.idl \
-        nsIPrincipal.idl             \
-        nsICodebasePrincipal.idl     \
-        nsICertificatePrincipal.idl  \
-        $(NULL)
+XPIDLSRCS	= \
+		nsIScriptSecurityManager.idl \
+		nsIPrincipal.idl \
+		nsICodebasePrincipal.idl \
+		nsICertificatePrincipal.idl \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/caps/include/Makefile.in b/caps/include/Makefile.in
index e5e4688485c2..c4b63ac66d41 100644
--- a/caps/include/Makefile.in
+++ b/caps/include/Makefile.in
@@ -1,4 +1,4 @@
-#!gmake
+#
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
 # compliance with the NPL.  You may obtain a copy of the NPL at
@@ -13,25 +13,26 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
-MODULE = caps
-
-DEPTH = ../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS =                         \
-        nsSystemPrincipal.h       \
-        nsCertificatePrincipal.h  \
-        nsCodebasePrincipal.h     \
-        nsJSPrincipals.h          \
-        nsScriptSecurityManager.h 
+MODULE		= caps
 
+EXPORTS		= \
+		nsSystemPrincipal.h \
+		nsCertificatePrincipal.h \
+		nsCodebasePrincipal.h \
+		nsJSPrincipals.h \
+		nsScriptSecurityManager.h \
+		$(NULL)
 
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/dbm/Makefile.in b/dbm/Makefile.in
index 09f43b200a79..3393921d16bc 100644
--- a/dbm/Makefile.in
+++ b/dbm/Makefile.in
@@ -1,4 +1,3 @@
-#! gmake
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
@@ -14,24 +13,22 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
-DEPTH = ..
+DEPTH		= ..
 topsrcdir	= @top_srcdir@
 VPATH		= @srcdir@
 srcdir		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE = dbm
+MODULE		= dbm
+RELEASE		= dbm
 
-RELEASE = dbm
-
-DIRS =  include \
-        src     \
-	$(NULL)
+DIRS		= include src
 
 ifdef ENABLE_TESTS
-DIRS += tests
+DIRS		+= tests
 endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/dbm/include/Makefile.in b/dbm/include/Makefile.in
index a3e0c5517f73..de6f911ee2a5 100644
--- a/dbm/include/Makefile.in
+++ b/dbm/include/Makefile.in
@@ -1,36 +1,33 @@
-#! gmake
-
-DEPTH = ../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 VPATH		= @srcdir@
 srcdir		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE = dbm
+MODULE		= dbm
 
-EXPORTS =	nsres.h   \
-		cdefs.h   \
+EXPORTS		= \
+		nsres.h \
+		cdefs.h \
 		mcom_db.h \
 		ncompat.h \
 		winfile.h \
 		$(NULL)
 
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
-PRIVATE_EXPORTS =	hsearch.h \
-			page.h    \
-			extern.h  \
-			ndbm.h    \
-			queue.h   \
-			hash.h    \
-			mpool.h   \
-			search.h  \
-			$(NULL)
+PRIVATE_EXPORTS	= \
+		hsearch.h \
+		page.h \
+		extern.h \
+		ndbm.h \
+		queue.h \
+		hash.h \
+		mpool.h \
+		search.h \
+		$(NULL)
 
-PRIVATE_EXPORTS := $(addprefix $(srcdir)/, $(PRIVATE_EXPORTS))
+PRIVATE_EXPORTS	:= $(addprefix $(srcdir)/, $(PRIVATE_EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
-
-
-