2000-10-25 Andrew Choi <akochoi@i-cable.com>

	* cw5-mcp.xml: renamed from emacs-cw5.mcp.xml.

	* cw6-mcp.xml: renamed from emacs-cw6.mcp.xml.

	* inc/defs-cw5.h: renamed from inc/cmdline-defs-cw5.h.

	* inc/defs-cw6.h: renamed from inc/cmdline-defs-cw6.h.

6 files changed, 19 insertions, 9 deletions

diff --git a/mac/ChangeLog b/mac/ChangeLog
index 7c2021bf340..9ff18712ef5 100644
--- a/mac/ChangeLog
+++ b/mac/ChangeLog
@@ -1,4 +1,14 @@
-2000-10-24  Andrew Choi  <akochoi@i-cable.com>
+2000-10-25  Andrew Choi  <akochoi@i-cable.com>
+
+	* cw5-mcp.xml: renamed from emacs-cw5.mcp.xml.
+
+	* cw6-mcp.xml: renamed from emacs-cw6.mcp.xml.
+
+	* inc/defs-cw5.h: renamed from inc/cmdline-defs-cw5.h.
+
+	* inc/defs-cw6.h: renamed from inc/cmdline-defs-cw6.h.
+
+a2000-10-24  Andrew Choi  <akochoi@i-cable.com>
 
 	* src/macterm.c (XTread_socket): check whether Lisp variable
 	mac-ready-for-drag-n-drop is bound rather than non-nil value.
diff --git a/mac/INSTALL b/mac/INSTALL
index 18ab3b4d201..91d89d3ca03 100644
--- a/mac/INSTALL
+++ b/mac/INSTALL
@@ -38,12 +38,12 @@ makefile.mpw.  I.e., execute the commands
   Emacs.MakeScript
 
 To build Emacs using CodeWarrior, start up the CodeWarrior IDE, choose
-File->Import Project...  and select the file emacs-cw5.mcp.xml or
-emacs-cw6.mcp.xml, depending on which verison of CodeWarrior used.
-When prompted to save the project, navigate to same directory as the
-file emacs-cw[56].mcp.xml, name it emacs-cw5.mcp or emacs-cw6.mcp, and
-save it there.  Then choose Project->Make.  Note that this does not
-build the DOC file.  To do so, use MPW and build the target "Doc" in
+File->Import Project...  and select the file cw5-mcp.xml or
+cw6-mcp.xml, depending on which verison of CodeWarrior used.  When
+prompted to save the project, navigate to same directory as the file
+cw[56]-mcp.xml, name it emacs-cw5.mcp or emacs-cw6.mcp, and save it
+there.  Then choose Project->Make.  Note that this does not build the
+DOC file.  To do so, use MPW and build the target "Doc" in
 makefile.MPW.
 
 Once built, the Emacs application (Emacs CW or Emacs MPW) can be
diff --git a/mac/emacs-cw5.mcp.xml b/mac/cw5-mcp.xml
index c9967473042..835903ffedf 100644
--- a/mac/emacs-cw5.mcp.xml
+++ b/mac/cw5-mcp.xml
@@ -558,7 +558,7 @@
                 <SETTING><NAME>MWFrontEnd_C_onlystdkeywords</NAME><VALUE>0</VALUE></SETTING>
                 <SETTING><NAME>MWFrontEnd_C_enumsalwaysint</NAME><VALUE>0</VALUE></SETTING>
                 <SETTING><NAME>MWFrontEnd_C_mpwpointerstyle</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_prefixname</NAME><VALUE>cmdline-defs-cw5.h</VALUE></SETTING>
+                <SETTING><NAME>MWFrontEnd_C_prefixname</NAME><VALUE>defs-cw5.h</VALUE></SETTING>
                 <SETTING><NAME>MWFrontEnd_C_ansistrict</NAME><VALUE>0</VALUE></SETTING>
                 <SETTING><NAME>MWFrontEnd_C_mpwcnewline</NAME><VALUE>0</VALUE></SETTING>
                 <SETTING><NAME>MWFrontEnd_C_wchar_type</NAME><VALUE>0</VALUE></SETTING>
diff --git a/mac/emacs-cw6.mcp.xml b/mac/cw6-mcp.xml
index ff54af2bbc1..5e459157eeb 100644
--- a/mac/emacs-cw6.mcp.xml
+++ b/mac/cw6-mcp.xml
@@ -555,7 +555,7 @@
                 <SETTING><NAME>MWFrontEnd_C_onlystdkeywords</NAME><VALUE>0</VALUE></SETTING>
                 <SETTING><NAME>MWFrontEnd_C_enumsalwaysint</NAME><VALUE>0</VALUE></SETTING>
                 <SETTING><NAME>MWFrontEnd_C_mpwpointerstyle</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_prefixname</NAME><VALUE>cmdline-defs-cw6.h</VALUE></SETTING>
+                <SETTING><NAME>MWFrontEnd_C_prefixname</NAME><VALUE>defs-cw6.h</VALUE></SETTING>
                 <SETTING><NAME>MWFrontEnd_C_ansistrict</NAME><VALUE>0</VALUE></SETTING>
                 <SETTING><NAME>MWFrontEnd_C_mpwcnewline</NAME><VALUE>0</VALUE></SETTING>
                 <SETTING><NAME>MWFrontEnd_C_wchar_type</NAME><VALUE>0</VALUE></SETTING>
diff --git a/mac/inc/cmdline-defs-cw5.h b/mac/inc/defs-cw5.h
index 78577837761..78577837761 100644
--- a/mac/inc/cmdline-defs-cw5.h
+++ b/mac/inc/defs-cw5.h
diff --git a/mac/inc/cmdline-defs-cw6.h b/mac/inc/defs-cw6.h
index c24befb02f7..c24befb02f7 100644
--- a/mac/inc/cmdline-defs-cw6.h
+++ b/mac/inc/defs-cw6.h