Set CFLAGS=-O2, not -g. Handle the new

M_FILE, S_FILE, and SET_MAKE defines.  Get rid of ^Ms.

msdos/sed1.inp

-# ----------------------------------------------------------------------
-# Configuration script for makefile.in-in
-# ----------------------------------------------------------------------
-s/^#.*//
-s/^[ \f\t][ \f\t]*$//
-s/^ /	/
-/^obj=/s!$! dosfns.o msdos.o!
-/window.elc/s!window.elc!window.elc ${lispdir}dos-fns.elc!
-s/\.h\.in/.h-in/
-s!^.-if.*inc-vers.*$!#!
-s!^	\./temacs!	go32 temacs!
-s!/bin/sh!command.com!
-/^MAKE *=/s/^/# /
-/^SHELL *=/s/^/# /
-/^srcdir *=/s/@[^@\n]+@/./
-/^VPATH *=/s/@[^@\n]+@/./
-/^CC *=/s/@[^@\n]+@/gcc/
-/^CPP *=/s/@[^@\n]+@/gcc -e/
-/^CFLAGS *=/s/@[^@\n]+@/-g/
-/^LN_S *=/s/@[^@\n]+@/ln -s/
-/DEBUG_MOLE *=/s/=.*$/=/
-/^.\${libsrc}make-doc/s!>.*$!!
-/^.\${libsrc}make-docfile/s!make-docfile!make-docfile -o ../etc/DOC!
-/^.\${libsrc}make-docfile/s/\$/go32 $/
-/^[ 	]*$/d
+# -sed1.inp-------------------------------------------------------------
+# Configuration script for makefile.in-in
+# ----------------------------------------------------------------------
+s/^#.*//
+s/^[ \f\t][ \f\t]*$//
+s/^ /	/
+/^obj=/s!$! dosfns.o msdos.o!
+/window.elc/s!window.elc!window.elc ${lispdir}dos-fns.elc!
+s/\.h\.in/.h-in/
+s!^.-if.*inc-vers.*$!#!
+s!^	\./temacs!	go32 temacs!
+s!/bin/sh!command.com!
+/^MAKE *=/s/^/# /
+/^SHELL *=/s/^/# /
+/^srcdir *=/s/@[^@\n]+@/./
+/^VPATH *=/s/@[^@\n]+@/./
+/^CC *=/s/@[^@\n]+@/gcc/
+/^CPP *=/s/@[^@\n]+@/gcc -e/
+/^CFLAGS *=/s/@[^@\n]+@/-O2 -g/
+/^LN_S *=/s/@[^@\n]+@/ln -s/
+/^M_FILE *=/s!@[^@\n]+@!m/dos386.h!
+/^S_FILE *=/s!@[^@\n]+@!s/msdos.h!
+/^@SET_MAKE@$/s/@SET_MAKE@//
+/DEBUG_MOLE *=/s/=.*$/=/
+/^.\${libsrc}make-doc/s!>.*$!!
+/^.\${libsrc}make-docfile/s!make-docfile!make-docfile -o ../etc/DOC!
+/^.\${libsrc}make-docfile/s/\$/go32 $/
+/^[ 	]*$/d