2004-11-12 Paul Jakma <paul@dishone.st>

	* INSTALL.quagga.txt: Some quagga specific INSTALL notes.
	* README: s/GNU Zebra/Quagga/ and refer to IS-IS support.

diff --git a/ChangeLog b/ChangeLog
index 19fadc86092b7c17599209cd6900498251573b84..ad87e3455a4cdc91c0e973a7835dbe9791eeac17 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
        * INSTALL: update-autotools, autoreconf -i will install this, remove
          the file so it always matches the autoconf which created
           configure (ie the quagga snapshot producing host).
+       * INSTALL.quagga.txt: Some quagga specific INSTALL notes.
+       * README: s/GNU Zebra/Quagga/ and refer to IS-IS support.
 
 2004-11-10 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
 

diff --git a/INSTALL.quagga.txt b/INSTALL.quagga.txt
new file mode 100644 (file)
index 0000000..e79e9dc
--- /dev/null
+++ b/INSTALL.quagga.txt
@@ -0,0 +1,50 @@
+--------------------------------------------------------------------------
+Building and Installing Quagga:
+
+The 'INSTALL' file contains generic instructions on how to use 'configure'
+scripts.
+
+For further Quagga specific information on 'configure' and build-time
+configuration of the software, please read the Quagga info documentation,
+(doc/quagga.info). To read the info page included with the Quagga sources
+without first installing Quagga:
+
+       cd doc/
+       pinfo -r quagga.info
+
+Assuming you have the user-friendly 'pinfo' info browser installed.
+
+You can also the standard GNU 'info' browser, if you prefer this browser you
+have no doubt already spent a lot of time reading its documentation and dont
+need to be told how to specify an info file by filename. ;)
+
+The Quagga website should also have recent versions of documentation
+available online.
+
+--------------------------------------------------------------------------
+Building Quagga from CVS checkouts:
+
+In order to build from CVS, you will need recent versions of several GNU
+tools, particularly autoconf, automake, libtool and texinfo. Note that the
+CVS snapshots on the Quagga website do not require these tools, everything
+is already setup ready to run 'configure', and if you have trouble building
+from CVS checkout it is recommended that you try a CVS snapshot instead.
+
+If you must build from plain CVS checkouts, the versions which should work
+at least with:
+
+       automake:       1.8.5
+       autoconf:       2.59
+       libtool:        1.5.6
+       texinfo:        4.7-4
+
+To create the required files, run either the 'update-autotools' script
+provided, or else the 'autoreconf' command supplied with your autoconf
+package. After this you may run configure. You will need a recentish version
+of GNU Texinfo in order to build doc/quagga.info, which is not supplied in
+CVS, but is supplied in the CVS snapshots on the Quagga website. You will
+need to run make to create this file.
+
+Please refer to "Building and Installing Quagga" above for further
+instructions.
+--------------------------------------------------------------------------

diff --git a/README b/README
index 72bccfca9b772018c4280cf92f0c6f50be794f53..f1b25d8a92e1d3625ac1ed4c120ef3502222a94b 100644 (file)
--- a/README
+++ b/README
@@ -1,12 +1,11 @@
-GNU Zebra is free software that manages various IPv4 and IPv6 routing
+Quagga is free software that manages various IPv4 and IPv6 routing
 protocols.
 
-Currently GNU Zebra supports BGP4, BGP4+, OSPFv2, OSPFv3, RIPv1,
-RIPv2, and RIPng.
+Currently Quagga supports BGP4, BGP4+, OSPFv2, OSPFv3, RIPv1,
+RIPv2, and RIPng as well as very early support for IS-IS.
   
-See the file INSTALL for building and installation instructions.
+See the file INSTALL.quagga.txt for building and installation instructions.
   
 See the file REPORTING-BUGS to report bugs.
   
-GNU Zebra is free software. See the file COPYING for copying conditions.
-
+Quagga is free software. See the file COPYING for copying conditions.