Changed EDITOR env to MOZ_EDITOR. Submitted by Tim Rowley <tor@cs.brown.edu>

cmd/stubfe/Makefile.in

@@ -279,7 +279,7 @@ BASIC_LIBS	+= \
 		  $(DIST)/lib/libjmd.a \
 		  $(NULL)
 
-ifdef EDITOR
+ifdef MOZ_EDITOR
 BASIC_LIBS	+= $(DIST)/lib/libedtplug.a
 endif
 
@@ -318,7 +318,7 @@ BASIC_LIBS      += $(DIST)/lib/liboji.a
 
 ifdef NSJVM
 
-ifdef EDITOR
+ifdef MOZ_EDITOR
 BASIC_LIBS	+= $(DIST)/lib/libedtplug.a
 endif
 BASIC_LIBS      += $(DIST)/lib/libsoftupdate.a

cmd/xfe/Makefile.in

@@ -477,7 +477,7 @@ BASIC_LIBS	+= \
 		  $(DIST)/lib/libjmd.a \
 		  $(NULL)
 
-ifdef EDITOR
+ifdef MOZ_EDITOR
 BASIC_LIBS	+= $(DIST)/lib/libedtplug.a
 endif
 
@@ -516,7 +516,7 @@ BASIC_LIBS      += $(DIST)/lib/liboji.a
 
 ifdef NSJVM
 
-ifdef EDITOR
+ifdef MOZ_EDITOR
 BASIC_LIBS	+= $(DIST)/lib/libedtplug.a
 endif
 BASIC_LIBS      += $(DIST)/lib/libsoftupdate.a

cmd/xfe/icons/Makefile.in

@@ -52,7 +52,7 @@ include $(topsrcdir)/config/rules.mk
 
 #### NEXT FEW LINES ARE ONLY FOR TESTING -- full build!
 #MOZ_MAIL_NEWS	= 1
-#EDITOR		= 1
+#MOZ_EDITOR	= 1
 #MOZ_OFFLINE	= 1
 #MOZ_LOC_INDEP	= 1
 #MOZ_TASKBAR	= 1
@@ -108,7 +108,7 @@ NICONS += \
 	images/Desk_MsgCompose.gif \
 	images/Desk_NewMail.gif
 
-ifdef EDITOR
+ifdef MOZ_EDITOR
 ICONS += $(wildcard $(srcdir)/images/e*.gif $(srcdir)/images/Desk_Composer.gif)
 endif
 

cmd/xfe/src/Makefile.in

@@ -259,7 +259,7 @@ CPPSRCS		+= \
 endif
 endif
 
-ifdef EDITOR
+ifdef MOZ_EDITOR
 CPPSRCS		+= \
 		  EditorDrop.cpp \
 		  EditorFrame.cpp \

lib/layout/Makefile.in

@@ -57,6 +57,14 @@ CSRCS		= bullet.c \
 		  laylayer.c \
 		  layrelay.c \
 		  laytrav.c \
+		  layfree.c \
+		  layimage.c \
+		  layout.c \
+		  laysel.c \
+		  laytable.c \
+		  laytags.c \
+		  laytext.c \
+		  layutil.c \
                   $(NULL)
 
 REQUIRES	= parse style js layer applet nspr security dbm img util jtools edtplug java hook pref libfont lay rdf network htmldlgs privacy mocha oji ojiimpl xpcom
@@ -67,18 +75,10 @@ endif
 
 include $(topsrcdir)/config/config.mk
 
+ifdef MOZ_EDITOR
 CSRCS		+= layedit.c \
-		  layfree.c \
-		  layimage.c \
-		  layout.c \
-		  laysel.c \
-		  laytable.c \
-		  laytags.c \
-		  laytext.c \
-		  layutil.c \
 		  $(NULL)
 
-ifdef EDITOR
 CPPSRCS		= streams.cpp \
 		  fsfile.cpp \
 		  editor.cpp \

modules/Makefile.in

@@ -56,14 +56,14 @@ ifdef MOZ_OJI
 DIRS		+= oji
 endif
 
-ifdef EDITOR
+ifdef MOZ_EDITOR
 
 ifdef JAVA_OR_NSJVM	# change later to JAVA_OR_OJI
 DIRS            += edtplug
 endif # JAVA_OR_NSJVM
 
 DIRS		+= spellchk
-endif # EDITOR
+endif # MOZ_EDITOR
 
 ifeq ($(subst /,_,$(shell uname -s)),OS2)
 DIRS	+= spellchk

modules/libpref/src/Makefile.in

@@ -66,7 +66,7 @@ CONFIG_FILES	+= \
 		  $(NULL)
 endif
 
-ifdef EDITOR
+ifdef MOZ_EDITOR
 CONFIG_FILES	+= \
 		  init/editor.js \
 		  $(NULL)