Update the list of utilities needed by lisp/Makefile and for bootstrapping.

2 files changed, 28 insertions, 1 deletions

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 32a1cd94292..795088dca19 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,5 +1,29 @@
 2008-11-15  Eli Zaretskii  <eliz@gnu.org>
 
+        Make bootstrap work again:
+
+        * mainmake.v2 (boot): New variable.
+        (src): Pass $(boot) to sub-Make.  Remove src/bootlisp.  If
+        src/bootlisp exists after running Make, run Make in `lisp' as
+        well.
+        (clean, mostlyclean): Remove bogus repeated clean in the top-level
+        directory.
+        (info, bootstrap-clean): New targets.
+        (bootstrap): Depend only on bootstrap-clean.  Commands modified to
+        be equivalent to top-level Makefile.in.
+        (bootfast, bootstrap-lisp-1, bootstrap-lisp, bootstrap-src)
+        (bootstrap-clean-before, bootstrap-clean-after): Targets deleted.
+        (clean, mostlyclean, distclean, maintainer-clean, extraclean):
+        Don't recurse into lwlib and oldXMenu.
+
+        * sed1v2.inp: Create bootlisp when bootstrapping b-emacs.exe.
+
+        * sedlisp.inp: Don't convert *.el files to Unix text format, and
+        don't copy ldefs-boot.el into loaddefs.el.
+
+        * sed6.inp: Edit out Unixy shell features in maintainer-clean
+        targets in doc/ Makefiles.
+
         * INSTALL: Update the list of utilities needed by lisp/Makefile
         and for bootstrapping.
 
diff --git a/msdos/INSTALL b/msdos/INSTALL
index f9adb6606dd..4ba59aadaf4 100644
--- a/msdos/INSTALL
+++ b/msdos/INSTALL
@@ -24,7 +24,10 @@ requires additional utilities: `find' (from Findutils), GNU `echo' and
 need to run lisp/Makefile, as all the Lisp files are distributed in
 byte-compiled form as well.  As for bootstrapping, you will only need
 that if you check-out development sources from the Emacs source
-repository.
+repository.  (Note: If you are checking out of CVS, use the -kb option
+of the `checkout' and `update' commands, to preserve the original
+Unix-style EOL format of the files.  If some Lisp files are converted
+to DOS format, the build might fail.)
 
 If you are building the DJGPP version of Emacs on a DOS-like system
 which supports long file names (e.g. Windows 9X or Windows XP), you