X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/c1473b4cfeb477ced05d457868c5e1eb97a58eb0..64657387b27fef24a961228d7c7b5f18a5fa05f3:/INSTALL.CVS

diff --git a/INSTALL.CVS b/INSTALL.CVS
index 80aa25e427..aee016f28d 100644
--- a/INSTALL.CVS
+++ b/INSTALL.CVS
@@ -1,38 +1,26 @@
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008
+Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
   Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
 	      Building and Installing Emacs from CVS
 
+If this is the first time you go through it, you'll need to configure
+before bootstrapping:
+
+  $ ./configure
+
 Some of the files that are included in the Emacs tarball, such as
 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":
 
   $ cvs update -dP
-  $ ./configure
   $ make bootstrap
 
-The bootstrap process makes sure all necessary files are rebuilt
-before it builds the final Emacs binary.  Unfortunately, it doesn't
-always work when there are stale files from a previous build in the
-directory tree.
-
-So if 'make bootstrap' fails, it may be necessary first to do 'make
-maintainer-clean' to clear out these stale files.  You can then try
-again, starting with `./configure'.
-
 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
@@ -53,8 +41,7 @@ was not provided").  In that case, follow the instructions below.
 To update loaddefs.el (and similar files), do:
 
   $ cd lisp
-  $ make autogen-clean
-  $ make autoloads EMACS=../src/emacs
+  $ make autoloads
 
 If either of the above partial procedures fails, try "make bootstrap".
 
@@ -68,15 +55,19 @@ 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
 or gnu.emacs.bug.  Ideally, use M-x report-emacs-bug RET which will
 send it to the proper place.
 
+Because the CVS version of Emacs is a work in progress, it will
+sometimes fail to build.  Please wait a day or so (and check the bug
+and development mailing list archives) before reporting such problems.
+In most cases, the problem is known about and is just waiting for
+someone to fix it.
+
 
 Note on using SSH to access the CVS repository from inside Emacs
 ----------------------------------------------------------------