Index: general/prog/gcc.xml
===================================================================
--- general/prog/gcc.xml	(revision 64d97b7c532eb01d7a1399dbb30646d77c9a6b6e)
+++ general/prog/gcc.xml	(revision de102fc8e989a9c2ef049ff6012c1199fab69c41)
@@ -3,8 +3,9 @@
 <title>gcc-&gcc-version;</title>
 
+&gnat-intro;
+&gnat-inst;
 &gcc-intro;
 &gcc-inst;
 &gcc-exp;
-&gcc-inst1;
 &gcc-desc;
 
Index: general/prog/gcc/gcc-desc.xml
===================================================================
--- general/prog/gcc/gcc-desc.xml	(revision 64d97b7c532eb01d7a1399dbb30646d77c9a6b6e)
+++ general/prog/gcc/gcc-desc.xml	(revision de102fc8e989a9c2ef049ff6012c1199fab69c41)
@@ -19,11 +19,80 @@
 <sect2><title>Description</title>
 
-<para>These programs and libraries have been documented on the
-LFS gcc-&gcc-version; page and at <xref linkend="gnat"/> except
-for:</para>
+<para>The programs and libraries whose descriptions are missing here
+have been described in the LFS gcc-&gcc-version; page.</para>
 
 <sect3><title>g77</title>
 <para>g77 is the fortran compiler invoked by gcc.</para></sect3>
 
+<sect3><title>add2line</title>
+<para>add2line converts the ASCII form of the 2-line orbital elements in
+a file to binary form and appends them to the orbdata files. </para></sect3>
+
+<sect3><title>gcov</title>
+<para>gcov is a test coverage program.</para></sect3>
+
+<sect3><title>gdb</title>
+<para>gdb is the GNAT debugger.</para></sect3>
+
+<sect3><title>gnatbind</title>
+<para>gnatbind is used to bind compiled objects.</para></sect3>
+
+<sect3><title>gnatbl</title>
+<para>gnatbl is the Ada linker. </para></sect3>
+
+<sect3><title>gnatchop</title>
+<para>gnatchop is useful for renaming files to meet the standard Ada
+default file naming conventions.</para></sect3>
+
+<sect3><title>gnatelim</title>
+<para>gnatelim is used to detect and eliminate unused subprograms in an
+Ada partition.</para></sect3>
+
+<sect3><title>gnatfind</title>
+<para>gnatfind is the GNAT definition/use finder.</para></sect3>
+
+<sect3><title>gnatgcc</title>
+<para>gnatgcc is the compiler.</para></sect3>
+
+<sect3><title>gnathtml.pl</title>
+<para>gnathtml.pl converts Ada souce files to html for viewing in Web
+browsers.</para></sect3>
+
+<sect3><title>gnatkr</title>
+<para>gnatkr is used to determine the crunched name for a given file,
+when crunched to a specified maximum length.</para></sect3>
+
+<sect3><title>gnatlink</title>
+<para>gnatlink is used to link programs and build an executable file.</para></sect3>
+
+<sect3><title>gnatls</title>
+<para>gnatls is the compiled unit browser.</para></sect3>
+
+<sect3><title>gnatemake</title>
+<para>gnatmake ia an automatic make facility.</para></sect3>
+
+<sect3><title>gnatmem</title>
+<para>gnatmem is the GNAT utility that monitors dynamic allocation and
+deallocation activity in a program.</para></sect3>
+
+<sect3><title>gnatprep</title>
+<para>gnatprep is the GNAT external preprocessor.</para></sect3>
+
+<sect3><title>gnatpsta</title>
+<para>gnatpsta determines the values of all the relevant parameters in
+Standard and outputs to stdout.</para></sect3>
+
+<sect3><title>gnatpsys</title>
+<para>gnatpsys determines the values of all the relevant parameters in
+System and outputs to stdout.</para></sect3>
+
+<sect3><title>gnatstub</title>
+<para>gnatstub is a generator of body stubs.</para></sect3>
+
+<sect3><title>gnatxref</title>
+<para>gnatxref is the GNAT cross referencer.</para></sect3>
+
+<sect3><title>gvd</title>
+<para>gvd is the GNU Visual Debugger.</para></sect3>
 
 </sect2>
Index: general/prog/gcc/gcc-exp.xml
===================================================================
--- general/prog/gcc/gcc-exp.xml	(revision 64d97b7c532eb01d7a1399dbb30646d77c9a6b6e)
+++ general/prog/gcc/gcc-exp.xml	(revision de102fc8e989a9c2ef049ff6012c1199fab69c41)
@@ -2,19 +2,19 @@
 <title>Command explanations</title>
 
-<para><userinput>export CC=cc</userinput> : This command allows you to
-use gcc's C compiler instead of gnat's C compiler.</para>
-
-<para><userinput>export PATH_HOLD=$PATH</userinput> : This command
+<para><userinput>PATH_HOLD=$PATH</userinput> : This command
 stores your current path before it's modified so that it can be restored after
 installation.</para>
 
-<para><userinput>export PATH=/usr/src/gnat/bin:$PATH</userinput> : This
+<para><userinput>export PATH=$PATH:/opt/gnat/bin</userinput> : This
 command allows the build to find gnat's Ada compiler to build
 Ada.</para>
 
+<para><userinput>touch treeprs.ads [es]info.h nmake.ad[bs]</userinput> :
+This command creates necessary files for the Ada build. This step
+may be skipped if you don't want to compile the ada frontend.</para>
+
 <para><userinput>--enable-languages=c,c++,objc,f77,ada,java</userinput>
-: This command builds all available languages in the gcc package except
-java.  You can modify this command to remove unwanted languages. If you
-are removing Ada, use the separate installation instructions below.</para>
+: This command builds all available languages in the gcc package.
+You may modify this command to remove unwanted languages.</para>
 
 <para><userinput>--enable-shared --enable-threads=posix
@@ -22,14 +22,10 @@
 the C++ libraries to published standards.</para>
 
-<para><userinput>--with-slibdir=/lib</userinput> : This command sets the path to
-libgcc_s.so.</para>
-
 <para><userinput>--enable-clocale=gnu</userinput> : This command is a
 failsafe for incomplete localedata.</para>
 
-<para><userinput>touch treeprs.ads [es]info.h nmake.ad[bs]</userinput> : This command creates necessary files for the Ada build.</para>
-
 <para><userinput>make gnatlib_and tools</userinput> : This command
-completes the Ada build process.</para>
+completes the Ada build process. Skip this step if you have not enabled
+ADA as one of the languages.</para>
 
 </sect2>
Index: general/prog/gcc/gcc-inst.xml
===================================================================
--- general/prog/gcc/gcc-inst.xml	(revision 64d97b7c532eb01d7a1399dbb30646d77c9a6b6e)
+++ general/prog/gcc/gcc-inst.xml	(revision de102fc8e989a9c2ef049ff6012c1199fab69c41)
@@ -4,24 +4,22 @@
 <para>Install gcc by running the following commands:</para>
 
-<para><screen><userinput>export CC=cc &amp;&amp;
-unset CFLAGS
-unset CXXFLAGS
-export PATH_HOLD=$PATH &amp;&amp;
-export PATH=/usr/src/gnat/bin:$PATH &amp;&amp;
+<para><screen><userinput>PATH_HOLD=$PATH &amp;&amp;
+export PATH=$PATH:/opt/gnat/bin &amp;&amp;
+cd gcc/ada &amp;&amp;
+touch treeprs.ads [es]info.h nmake.ad[bs] &amp;&amp;
+cd ../.. &amp;&amp;
 mkdir ../gcc-build &amp;&amp;
 cd ../gcc-build &amp;&amp;
 ../gcc-&gcc-version;/configure --prefix=/usr --enable-shared \
 --enable-languages=c,c++,objc,f77,ada,java --enable-threads=posix \
---with-slibdir=/lib --enable-__cxa_atexit --enable-clocale=gnu &amp;&amp;
-cd ../gcc-&gcc-version;/gcc/ada &amp;&amp;
-touch treeprs.ads [es]info.h nmake.ad[bs] &amp;&amp;
-cd /usr/src/gcc-build &amp;&amp;
+--enable-__cxa_atexit --enable-clocale=gnu &amp;&amp;
 make bootstrap &amp;&amp;
-cd gcc &amp;&amp;
-make gnatlib_and_tools &amp;&amp;
-cd .. &amp;&amp;
+make -C gcc gnatlib_and_tools &amp;&amp;
 make install-no-fixedincludes &amp;&amp;
 export PATH=$PATH_HOLD</userinput></screen></para>
 
+<para>You may remove the gnat installation:</para>
+<para><screen><userinput>rm -rf /opt/gnat</userinput></screen></para>
+
 </sect2>
 
Index: general/prog/gcc/gcc-inst1.xml
===================================================================
--- general/prog/gcc/gcc-inst1.xml	(revision 64d97b7c532eb01d7a1399dbb30646d77c9a6b6e)
+++ 	(revision )
@@ -1,17 +1,0 @@
-<sect2>
-<title>Installation of gcc without Ada</title>
-
-<para>Install gcc by running the following commands:</para>
-
-<para><screen><userinput>unset CFLAGS
-unset CXXFLAGS
-mkdir ../gcc-build &amp;&amp;
-cd ../gcc-build &amp;&amp;
-../gcc-&gcc-version;/configure --prefix=/usr --enable-shared \
---enable-languages=c,c++,objc,f77,java --enable-threads=posix \
---with-slibdir=/lib --enable-__cxa_atexit --enable-clocale=gnu &amp;&amp;
-make bootstrap &amp;&amp;
-make install-no-fixedincludes</userinput></screen></para>
-
-</sect2>
-
Index: general/prog/gcc/gnat-inst.xml
===================================================================
--- general/prog/gcc/gnat-inst.xml	(revision de102fc8e989a9c2ef049ff6012c1199fab69c41)
+++ general/prog/gcc/gnat-inst.xml	(revision de102fc8e989a9c2ef049ff6012c1199fab69c41)
@@ -0,0 +1,29 @@
+<sect2>
+<title>Installation of gnat</title>
+
+<para>Install gnat by running the following commands:</para>
+
+<para><screen><userinput>./doconfig</userinput></screen></para>
+
+<para>The above script will ask you how and where you would like to install
+gnat. To avoid conflicts with the system gcc, the package will be installed
+in a seperate directory, that can later be removed from the system.</para>
+
+<para>In response to the questions asked by the doconfig script, enter
+<userinput>3</userinput> in response to the first question
+and <userinput>/opt/gnat</userinput> in response to the
+second question.</para>
+
+<para>To finish the install, run</para>
+<para><screen><userinput>./doinstall</userinput></screen></para>
+
+<para>The gnat compiler can be invoked by executing the gcc binary
+installed by the above script. To avoid conflicts with the system
+gcc, we will rename the gcc command.</para>
+<para><screen><userinput>mv /opt/gnat/bin &amp;&amp;
+mv gcc gnatgcc &amp;&amp;
+cd real &amp;&amp;
+mv gcc gnatgcc</userinput></screen></para>
+
+</sect2>
+
Index: general/prog/gcc/gnat-intro.xml
===================================================================
--- general/prog/gcc/gnat-intro.xml	(revision de102fc8e989a9c2ef049ff6012c1199fab69c41)
+++ general/prog/gcc/gnat-intro.xml	(revision de102fc8e989a9c2ef049ff6012c1199fab69c41)
@@ -0,0 +1,19 @@
+<sect2>
+<title>Introduction to gnat (binary version)</title>
+
+<screen>Download location (FTP):        <ulink url="&gnat-download-ftp;"/>
+Version used:                   &gnat-version;
+Package size:                   &gnat-size;
+Estimated Disk space required:  &gnat-buildsize;</screen>
+
+<para>The gnat package contains a precompiled Ada compiler.
+This package is used to satisfy the circular
+dependency when you recompile gcc to include ada.</para>
+
+<para>You may skip installation of gnat if you do not want to recompile gcc
+with ada support.</para>
+
+<screen>gnat depends on:
+<xref linkend="tcsh"/></screen>
+
+</sect2>
Index: general/prog/gcc/gnat.ent
===================================================================
--- general/prog/gcc/gnat.ent	(revision de102fc8e989a9c2ef049ff6012c1199fab69c41)
+++ general/prog/gcc/gnat.ent	(revision de102fc8e989a9c2ef049ff6012c1199fab69c41)
@@ -0,0 +1,8 @@
+<!ENTITY gnat SYSTEM "../gnat.xml">
+<!ENTITY gnat-intro SYSTEM "gnat-intro.xml">
+<!ENTITY gnat-inst SYSTEM "gnat-inst.xml">
+<!ENTITY gnat-buildsize "40 MB">
+<!ENTITY gnat-version "3.14p">
+<!ENTITY gnat-download-http "">
+<!ENTITY gnat-download-ftp "ftp://cs.nyu.edu/pub/gnat/3.14p/gnat-3.14p-i686-pc-linux-gnu-bin.tar.gz">
+<!ENTITY gnat-size "10.5 MB">
Index: general/prog/gnat.xml
===================================================================
--- general/prog/gnat.xml	(revision 64d97b7c532eb01d7a1399dbb30646d77c9a6b6e)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<sect1 id="gnat" xreflabel="gnat-&gnat-version;">
-<?dbhtml filename="gnat.html" dir="general"?>
-<title>gnat-&gnat-version;</title>
-
-&gnat-intro;
-&gnat-inst;
-&gnat-config;
-&gnat-desc;
-
-</sect1>
-
Index: general/prog/prog.xml
===================================================================
--- general/prog/prog.xml	(revision 64d97b7c532eb01d7a1399dbb30646d77c9a6b6e)
+++ general/prog/prog.xml	(revision de102fc8e989a9c2ef049ff6012c1199fab69c41)
@@ -8,5 +8,4 @@
 &j2sdk;
 &ruby;
-&gnat;
 &gcc;
 &gcc2;
