fixing two .xpt files of same name, raptor.xpt on windows and layout.xpt on unix. One version was getting overwritten

layout/base/public/Makefile.in

@@ -26,7 +26,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= layout
+MODULE		= layout_base
 
 EXPORTS		= \
 nslayout.h \

layout/base/public/makefile.win

@@ -82,7 +82,7 @@ EXPORTS =				\
 	nsIXIFConverter.h \
 	$(NULL)
 
-MODULE=raptor 
+MODULE=layout_base
 
 XPIDLSRCS=					\
 		.\nsIChromeEventHandler.idl	\

layout/xul/base/public/Makefile.in

@@ -26,7 +26,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= layout
+MODULE		= layout_xul
 
 EXPORTS		= \
     nsPIBoxObject.h \

layout/xul/base/public/makefile.win

@@ -39,6 +39,6 @@ XPIDLSRCS=      .\nsIBoxObject.idl                  \
                 .\nsIEditorBoxObject.idl \
                 $(NULL)
 
-MODULE=raptor 
+MODULE=layout_xul
 
 include <$(DEPTH)\config\rules.mak>