Sync'd.

cmd/Makefile.in

@@ -24,7 +24,7 @@ include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/config.mk
 
-DIRS = $(addsuffix fe, $(MOZ_FE)) patcher
+DIRS = $(addsuffix fe, $(MOZ_FE))
 
 include $(topsrcdir)/config/rules.mk
 

lib/libmime/Makefile.in

@@ -57,6 +57,12 @@ CSRCS		= \
 		  addr.c \
 		  $(NULL)
 
+ifdef MOZ_MAIL_NEWS
+CSRCS		+= \
+		  mimevcrd.c \
+		  $(NULL)
+endif
+
 REQUIRES = mime nspr dbm img util layer security pref js julian nls xp network
 
 include $(topsrcdir)/config/rules.mk
@@ -65,10 +71,10 @@ FILT_SRCS	= mimefilt.c mimestub.c
 FILT_OBJS	= $(addprefix $(OBJDIR)/,$(FILT_SRCS:.c=.o))
 
 ifdef MOZ_SECURITY
-INCLUDES	+= -I$(topsrcdir)/lib/libmime -I$(DIST)/public/security
+INCLUDES	+= -I$(DEPTH)/lib/libmime -I$(DIST)/public/security
 endif
 
-INCLUDES 	+= -I$(srcdir)/./
+INCLUDES 	+= -I$(srcdir)/
 
 ifndef MOZ_MAIL_COMPOSE
 DEFINES += -DMOZILLA_30

modules/Makefile.in

@@ -25,32 +25,32 @@ include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/config.mk
 
-DIRS = \
-	libhook \
-	libreg \
-	libpref \
-	libutil \
-	libimg \
-	libfont \
-	rdf \
-	xml \
-	schedulr \
-	li \
-	progress \
-	plugin \
-	$(NULL)
+DIRS		= \
+		  libhook \
+		  libreg \
+		  libpref \
+		  libutil \
+		  libimg \
+		  libfont \
+		  rdf \
+		  xml \
+		  schedulr \
+		  li \
+		  progress \
+		  plugin \
+		  $(NULL)
 
 ifndef MOZ_NATIVE_ZLIB
-DIRS += zlib
+DIRS		+= zlib
 endif
 
 ifndef MOZ_SECURITY
-DIRS +=	security
+DIRS		+= security
 endif
 
 ifdef MOZ_SMARTUPDATE
 DIRS		+= softupdt
-endif # MOZ_SMARTUPDATE
+endif
 
 ifdef MOZ_OJI
 DIRS		+= oji
@@ -59,14 +59,15 @@ endif
 ifdef MOZ_EDITOR
 
 ifdef JAVA_OR_NSJVM	# change later to JAVA_OR_OJI
-DIRS            += edtplug
-endif # JAVA_OR_NSJVM
+DIRS		+= edtplug
+endif
 
 DIRS		+= spellchk
+
 endif # MOZ_EDITOR
 
-ifeq ($(subst /,_,$(shell uname -s)),OS2)
-DIRS	+= spellchk
+ifeq ($(OS_ARCH),OS2)
+DIRS		+= spellchk
 endif
 
 include $(topsrcdir)/config/rules.mk