X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/142e26a72e9b8bbbec23c6bf7234e9f2544b5f89..83b5be731713a33c75ef78d99e95ece3de98a518:/INSTALL.CVS

diff --git a/INSTALL.CVS b/INSTALL.CVS
index b8c42de27d..97da65af71 100644
--- a/INSTALL.CVS
+++ b/INSTALL.CVS
@@ -10,47 +10,37 @@ byte-compiled Lisp files, are not stored in the CVS repository.
 Therefore, to build from CVS you must run "make bootstrap"
 instead of just "make":
 
-  $ ./configure
+  $ cvs update -dP
   $ make bootstrap
 
-The bootstrap process makes sure all necessary files are rebuilt
-before it builds the final Emacs binary.
-
-If 'make bootstrap' fails, it may be necessary to do 'make maintainer-clean'
-followed by configure before trying it again.  (Occasionally the loaddefs.el
-file gets into a bad state due to changes in the Lisp libraries; this procedure
-forces it to be regenerated.)
+Of course, if this is the first time you go through it, you'll need to do
+./configure before the "make bootstrap".
 
 Normally, it is not necessary to use "make bootstrap" after every CVS
-update.  Unless there are problems, we suggest using the following
-alternative procedure after you have done "make bootstrap" at least
-once:
+update.  "make" should work in 90% of the cases and be much quicker.
 
-  $ ./configure
-  $ make
-  $ cd lisp
-  $ make recompile EMACS=../src/emacs
-  $ cd ..
   $ make
 
 (If you want to install the Emacs binary, type "make install" instead
 of "make" in the last command.)
 
-Occasionally the file "lisp/loaddefs.el" (and similar *-loaddefs.el
-files in some subdirectories of lisp/, e.g. mh-e/ and calendar/) will
-need to be updated to reflect new autoloaded functions.  If you see
-errors (rather than warnings) about undefined lisp functions during
-compilation, that may be the reason.  Another symptom may be an error
-saying that "loaddefs.el" could not be found; this is due to a change
-in the way loaddefs.el was handled in CVS, and should only happen
-once, for users that are updating old CVS trees.  Finally, sometimes
-there can be build failures related to *loaddefs.el.  In that case,
-delete them before following the instructions below to update them.
+Occasionally the file "lisp/loaddefs.el" (and similar automatically
+generated files, such as esh-groups.el, and *-loaddefs.el in some
+subdirectories of lisp/, e.g. mh-e/ and calendar/) will need to be
+updated to reflect new autoloaded functions.  If you see errors (rather
+than warnings) about undefined lisp functions during compilation, that
+may be the reason.  Another symptom may be an error saying that
+"loaddefs.el" could not be found; this is due to a change in the way
+loaddefs.el was handled in CVS, and should only happen once, for users
+that are updating old CVS trees.  Finally, sometimes there can be build
+failures related to *loaddefs.el (e.g. "required feature `esh-groups'
+was not provided").  In that case, follow the instructions below.
 
 To update loaddefs.el (and similar files), do:
 
   $ cd lisp
-  $ make autoloads EMACS=../src/emacs
+  $ make autogen-clean
+  $ make autoloads
 
 If either of the above partial procedures fails, try "make bootstrap".
 
@@ -64,9 +54,7 @@ method.
 Users of non-Posix systems (MS-Windows etc.) should run the
 platform-specific configuration scripts (nt/configure.bat, config.bat,
 etc.) before "make bootstrap" or "make"; the rest of the procedure is
-applicable to those systems as well, except that the value of the
-EMACS variable on the Make command line might be different, e.g.,
-../bin/emacs.exe or some such.
+applicable to those systems as well.
 
 Questions, requests, and bug reports about the CVS versions of Emacs
 should be sent to emacs-pretest-bug@gnu.org rather than gnu.emacs.help