Index: general/prog/dejagnu.xml
===================================================================
--- general/prog/dejagnu.xml	(revision a61cf5161d09eefbbdf05cb8d361471e69344f8a)
+++ general/prog/dejagnu.xml	(revision af373d3582621f91b5d4156c1754a6df50d54091)
@@ -31,9 +31,11 @@
     <title>Introduction to DejaGnu</title>
 
-    <para><application>DejaGnu</application> is a framework for running test
-    suites on GNU tools. It is written in <command>expect</command>, which
-    uses <application>Tcl</application> (Tool command language). It was installed
-    by LFS in the temprary /tools directory.  These instructions install it
-    permanently.</para>
+    <para>
+      <application>DejaGnu</application> is a framework for running test
+      suites on GNU tools. It is written in <command>expect</command>, which
+      uses <application>Tcl</application> (Tool command language). It was installed
+      by LFS in the temporary <filename class="directory">/tools</filename>
+      directory.  These instructions install it permanently.
+    </para>
 
     &lfs72_checked;
@@ -64,12 +66,19 @@
 
     <bridgehead renderas="sect4">Required (Run-time Only)</bridgehead>
-    <para role="required"><xref linkend="expect"/></para>
+    <para role="required">
+      <xref linkend="expect"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="docbook-utils"/></para>
+    <para role="optional">
+      <xref linkend="docbook-utils"/> and
+      <ulink url="http://sourceforge.net/projects/docbook2x/">docbook2X</ulink>
+      (both looked for by the <command>configure</command> script but not used
+      in the build)
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/dejagnu"/></para>
-
+      <ulink url="&blfs-wiki;/dejagnu"/>
+    </para>
   </sect2>
 
@@ -77,16 +86,35 @@
     <title>Installation of DejaGnu</title>
 
-    <para>Install <application>DejaGnu</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>DejaGnu</application> by running the following
+      commands:
+    </para>
 
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+makeinfo --html --no-split -o doc/dejagnu.html doc/dejagnu.texi &amp;&amp;
+makeinfo --plaintext       -o doc/dejagnu.txt  doc/dejagnu.texi</userinput></screen>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      HTML and text documentation was created in the previous step. There
+      are different ways to create additional forms of documentation, if desired.
+      If you have <xref linkend="texlive"/> installed, create PDF and Postscript
+      docs in the <filename class="directory">doc</filename> directory by issuing
+      <command>make pdf ps</command>. If you have <xref linkend="docbook-utils"/>
+      installed, create PDF and Postscript docs in the top-level directory
+      by issuing <command>make dejagnu.{pdf,ps}</command>.
+    </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+    <para>
+      To test the results, issue <command>make check</command>.
+    </para>
 
-    <para>To test the installation, issue <command>make check</command> as
-    an unprivileged user.</para>
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
+<screen role="root"><userinput>make install &amp;&amp;
+install -v -m755 -d /usr/share/doc/dejagnu-&dejagnu-version; &amp;&amp;
+install -v -m644    doc/dejagnu.{html,txt} \
+                    /usr/share/doc/dejagnu-&dejagnu-version;</userinput></screen>
   </sect2>
 
@@ -117,6 +145,8 @@
         <term><command>runtest</command></term>
         <listitem>
-          <para>is the <application>DejaGnu</application> test driver program. It is
-          used to control what tests to run, and variations on how to run them.</para>
+          <para>
+            is the <application>DejaGnu</application> test driver program. It is
+            used to control what tests to run, and variations on how to run them.
+          </para>
           <indexterm zone="dejagnu runtest">
             <primary sortas="b-runtest">runtest</primary>
