Include local.at, not input.at, fixing a typo in the 2003-08-25 patch.

[bison.git] / README-cvs

diff --git a/README-cvs b/README-cvs
index c7043333ad6af7e04aa29363223f133891394352..0b9b27050d5b028c3a04b69620e08efe70218e87 100644 (file)
--- a/README-cvs
+++ b/README-cvs
@@ -1,13 +1,21 @@
+-*- outline -*-
+
 These notes intend to help people working on the CVS versions of
-Bison.  Only the sources are installed in the CVS repository (to ease
-the maintenance, merges etc.), therefore you will have to the
-maintainer tools we depend upon:
+Bison.
+
+* Requirements
+
+Only the sources are installed in the CVS repository (to ease the
+maintenance, merges etc.), therefore you will have to the maintainer
+tools we depend upon:
+
+- Automake 1.7
+
+- Autoconf 2.57
 
-- Automake 1.6 or 1.6.1
-- Autoconf 2.53 or better
-  (actually, CVS Autoconf provides a better autoreconf...
-   http://www.lrde.epita.fr/~akim/download/autoconf-2.53a.tar.gz)
-- Gettext 0.10.1
+- Gettext 0.12.1
+
+- CVS Bison itself
 
 Only building the initial full source tree will be a bit painful,
 later, a plain `cvs update -P & make' should be sufficient.
@@ -22,19 +30,7 @@ information on:
 
 The next step is asking the installation of all the missing files:
 
-       $ autoreconf -f -v -i
-
-Unfortunately, this will change a few files that should not have been
-replaced, so remove them, and ask for the original copies:
-
-       $ rm Makefile.am configure.in m4/Makefile.am
-       $ cvs update
-
-(Hopefully, these steps will no longer be needed in the future.)
-Because of these changes, running autoreconf a second, and last time,
-is needed.  Pay attention that the options are different this time:
-
-       $ autoreconf -v -f
+       $ ./bootstrap
 
 And there you are!  Just
 
@@ -49,24 +45,43 @@ should output no difference, except maybe the date in po/*.po files.
 
 Enjoy!
 
+* Troubleshooting
+
+Unfortunately the current Gettext still does not include all the
+needed tools so that the bootstrapping always perform successfully.
+
+If you experience problems, I suggest the following:
+
+1. Do a regular CVS checkout
+
+2. Fetch a recent tarball in:
+   http://www.lrde.epita.fr/~akim/download/
+
+3. Extract it
+
+4. Override the content of your checkout with the content of this
+   tarball, i.e.:
+   cp -r bison-1.49b/* bison-cvs
+
+5. Proceed on ./configure && make etc.
 
 -----
 
-Copyright (C) 2002 Free Software Foundation, Inc.
+Copyright (C) 2002, 2003 Free Software Foundation, Inc.
 
-This file is part of GNU Autoconf.
+This file is part of GNU Bison.
 
-GNU Autoconf is free software; you can redistribute it and/or modify
+GNU Bison is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
-GNU Autoconf is distributed in the hope that it will be useful,
+GNU Bison is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with autoconf; see the file COPYING.  If not, write to
+along with Bison; see the file COPYING.  If not, write to
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.