diff options
66 files changed, 420 insertions, 209 deletions
diff --git a/appendixa/bison-dep.xml b/appendixa/bison-dep.xml index 1c30484e1..a9cc1dd04 100644 --- a/appendixa/bison-dep.xml +++ b/appendixa/bison-dep.xml @@ -1,3 +1,5 @@ +<sect2><title> </title><para> </para></sect2> + <sect2> <title>Bison Installation Dependencies</title> diff --git a/appendixa/bison-desc.xml b/appendixa/bison-desc.xml index 46d297506..7793f3572 100644 --- a/appendixa/bison-desc.xml +++ b/appendixa/bison-desc.xml @@ -1,15 +1,12 @@ -<sect2><title>Contents of Bison</title> +<sect2><title> </title><para> </para></sect2> -<para>Last checked against version &bison-contversion;.</para> - -<sect3><title>Program Files</title> +<sect2><title>Descriptions</title> -<para>bison and yacc</para></sect3> +<para>Last checked against version &bison-contversion;.</para> -<sect3><title>Descriptions</title> +<sect3><title>Program file descriptions</title> <sect4><title>bison</title> - <para>bison is a parser generator, a replacement for yacc. yacc stands for Yet Another Compiler Compiler. What is bison then? It is a program that generates a program that analyzes the structure of a text file. Instead of @@ -46,7 +43,6 @@ answer. Of course, bison isn't only used for calculators alone.</para></sect4> <sect4><title>yacc</title> - <para>This bash script calls bison using the -y option. This is for compatibility purposes for programs which use yacc instead of bison.</para></sect4> diff --git a/appendixa/bison-shortdesc.xml b/appendixa/bison-shortdesc.xml new file mode 100644 index 000000000..6106d7435 --- /dev/null +++ b/appendixa/bison-shortdesc.xml @@ -0,0 +1,14 @@ +<sect2><title>Contents of Bison</title> + +<para>Last checked against version &bison-contversion;.</para> + +<para>Bison is a parser generator, a replacement for yacc. Bison +generates a program that analyzes the structure of a text file.</para> + +<para>Bison installs the following:</para> + +<sect3><title>Program Files</title> +<para>bison and yacc</para></sect3> + +</sect2> + diff --git a/appendixa/bison.xml b/appendixa/bison.xml index 2bf0f388b..bda14fc94 100644 --- a/appendixa/bison.xml +++ b/appendixa/bison.xml @@ -3,6 +3,7 @@ <?dbhtml filename="bison.html" dir="appendixa"?> &aa-bison-down; +&aa-bison-shortdesc; &aa-bison-desc; &aa-bison-dep; diff --git a/appendixa/fileutils-shortdesc.xml b/appendixa/fileutils-shortdesc.xml index 4a99f1b7c..47fc524c0 100644 --- a/appendixa/fileutils-shortdesc.xml +++ b/appendixa/fileutils-shortdesc.xml @@ -3,7 +3,7 @@ <para>Last checked against version &fileutils-contversion;.</para> <para>Fileutils is a package containing basic file manipulation programs. -Included are programs to list directories, create directories, update +Included are programs to list and create directories, update timestamps, change permissions and so forth.</para> <para>Fileutils installs the following files:</para> diff --git a/appendixa/flex-dep.xml b/appendixa/flex-dep.xml index 4f230cf33..26bc4f490 100644 --- a/appendixa/flex-dep.xml +++ b/appendixa/flex-dep.xml @@ -1,3 +1,5 @@ +<sect2><title> </title><para> </para></sect2> + <sect2> <title>Flex Installation Dependencies</title> diff --git a/appendixa/flex-desc.xml b/appendixa/flex-desc.xml index 02b2e88eb..51b1f2987 100644 --- a/appendixa/flex-desc.xml +++ b/appendixa/flex-desc.xml @@ -1,11 +1,10 @@ -<sect2><title>Contents of Flex</title> +<sect2><title> </title><para> </para></sect2> -<para>Last checked against version &flex-contversion;.</para> +<sect2><title>Descriptions</title> -<sect3><title>Program Files</title> -<para>flex, flex++ (link to flex) and lex</para></sect3> +<para>Last checked against version &flex-contversion;.</para> -<sect3><title>Descriptions</title> +<sect3><title>Program file descriptions</title> <sect4><title>flex</title> <para>flex is a tool for generating programs which recognize @@ -26,10 +25,7 @@ of flex.</para></sect4> </sect3> -<sect3><title>Library Files</title> -<para>libfl.a</para></sect3> - -<sect3><title>Descriptions</title> +<sect3><title>Library file descriptions</title> <sect4><title>libfl</title> <para>libfl is the flex library.</para></sect4> diff --git a/appendixa/flex-shortdesc.xml b/appendixa/flex-shortdesc.xml new file mode 100644 index 000000000..2b4c2ff2c --- /dev/null +++ b/appendixa/flex-shortdesc.xml @@ -0,0 +1,17 @@ +<sect2><title>Contents of Flex</title> + +<para>Last checked against version &flex-contversion;.</para> + +<para>The Flex package is used to generate programs which recognize +patterns in text.</para> + +<para>Flex installs the following:</para> + +<sect3><title>Program Files</title> +<para>flex, flex++ (link to flex) and lex</para></sect3> + +<sect3><title>Library Files</title> +<para>libfl.a</para></sect3> + +</sect2> + diff --git a/appendixa/flex.xml b/appendixa/flex.xml index f8fd5eeaf..86d836fa3 100644 --- a/appendixa/flex.xml +++ b/appendixa/flex.xml @@ -3,6 +3,7 @@ <?dbhtml filename="flex.html" dir="appendixa"?> &aa-flex-down; +&aa-flex-shortdesc; &aa-flex-desc; &aa-flex-dep; diff --git a/appendixa/gettext-dep.xml b/appendixa/gettext-dep.xml index 04443faaf..9f3f2fda4 100644 --- a/appendixa/gettext-dep.xml +++ b/appendixa/gettext-dep.xml @@ -1,3 +1,5 @@ +<sect2><title> </title><para> </para></sect2> + <sect2> <title>Gettext Installation Dependencies</title> diff --git a/appendixa/gettext-desc.xml b/appendixa/gettext-desc.xml index df3587379..f47c4ab2c 100644 --- a/appendixa/gettext-desc.xml +++ b/appendixa/gettext-desc.xml @@ -1,14 +1,10 @@ -<sect2><title>Contents of Gettext</title> +<sect2><title> </title><para> </para></sect2> -<para>Last checked against version &gettext-contversion;.</para> +<sect2><title>Descriptions</title> -<sect3><title>Program Files</title> -<para>config.charset, config.rpath, gettext, gettextize, hostname, -msgattrib, msgcat, msgcmp, msgcomm, msgconv, msgen, msgexec, msgfilter, -msgfmt, msggrep, msginit, msgmerge, msgunfmt, msguniq, ngettext, project-id, -team-address, trigger, urlget, user-email and xgettext</para></sect3> +<para>Last checked against version &gettext-contversion;.</para> -<sect3><title>Descriptions</title> +<sect3><title>Program file descriptions</title> <sect4><title>config.charset</title> <para>The config.charset script outputs a system-dependent table of @@ -119,10 +115,7 @@ files. It's used to make the first translation template.</para></sect4> </sect3> -<sect3><title>Library Files</title> -<para>libgettextlib[a,so], libgettextsrc[a,so]</para></sect3> - -<sect3><title>Descriptions</title> +<sect3><title>Library file descriptions</title> <sect4><title>libgettextlib</title> <para>No description is currently available.</para></sect4> diff --git a/appendixa/gettext-shortdesc.xml b/appendixa/gettext-shortdesc.xml new file mode 100644 index 000000000..d5003ff6d --- /dev/null +++ b/appendixa/gettext-shortdesc.xml @@ -0,0 +1,21 @@ +<sect2><title>Contents of Gettext</title> + +<para>Last checked against version &gettext-contversion;.</para> + +<para>The Gettext package is used for internationalization and +localization. Programs can be compiled with Native Language Support +(NLS) which enable them to output messages in the user's native +language.</para> + +<para>Gettext installs the following:</para> + +<sect3><title>Program Files</title> +<para>config.charset, config.rpath, gettext, gettextize, hostname, +msgattrib, msgcat, msgcmp, msgcomm, msgconv, msgen, msgexec, msgfilter, +msgfmt, msggrep, msginit, msgmerge, msgunfmt, msguniq, ngettext, project-id, +team-address, trigger, urlget, user-email and xgettext</para></sect3> + +<sect3><title>Library Files</title> +<para>libgettextlib[a,so], libgettextsrc[a,so]</para></sect3> + +</sect2> diff --git a/appendixa/gettext.xml b/appendixa/gettext.xml index f013a93d1..750c062f2 100644 --- a/appendixa/gettext.xml +++ b/appendixa/gettext.xml @@ -3,6 +3,7 @@ <?dbhtml filename="gettext.html" dir="appendixa"?> &aa-gettext-down; +&aa-gettext-shortdesc; &aa-gettext-desc; &aa-gettext-dep; diff --git a/appendixa/groff-dep.xml b/appendixa/groff-dep.xml index 1cfb11a07..698307744 100644 --- a/appendixa/groff-dep.xml +++ b/appendixa/groff-dep.xml @@ -1,3 +1,5 @@ +<sect2><title> </title><para> </para></sect2> + <sect2> <title>Groff Installation Dependencies</title> diff --git a/appendixa/groff-desc.xml b/appendixa/groff-desc.xml index 409d9500c..823bf0133 100644 --- a/appendixa/groff-desc.xml +++ b/appendixa/groff-desc.xml @@ -1,4 +1,6 @@ -<sect2><title>Contents of Groff</title> +<sect2><title> </title><para> </para></sect2> + +<sect2><title>Descriptions</title> <para>Last checked against version &groff-contversion;.</para> diff --git a/appendixa/groff-shortdesc.xml b/appendixa/groff-shortdesc.xml new file mode 100644 index 000000000..58e0ee3e8 --- /dev/null +++ b/appendixa/groff-shortdesc.xml @@ -0,0 +1,19 @@ +<sect2><title>Contents of Groff</title> + +<para>Last checked against version &groff-contversion;.</para> + +<para>The Groff package includes several text processing programs +for text formatting. Groff translates standard text and special +commands into formatted output, such as what you see in a manual +page.</para> + +<para>Groff installs the following:</para> + +<sect3><title>Program Files</title> +<para>addftinfo, afmtodit, eqn, geqn (link to eqn), grn, grodvi, +groff, grog, grolbp, grolj4, grops, grotty, gtbl (link to tbl), +hpftodit, indxbib, lkbib, lookbib, mmroff, neqn, nroff, pfbtops, +pic, post-grohtml, pre-grohtml, refer, soelim, tbl, tfmtodit, +troff and zsoelim (link to soelim)</para></sect3> + +</sect2> diff --git a/appendixa/groff.xml b/appendixa/groff.xml index c505ac926..89e8a4852 100644 --- a/appendixa/groff.xml +++ b/appendixa/groff.xml @@ -3,6 +3,7 @@ <?dbhtml filename="groff.html" dir="appendixa"?> &aa-groff-down; +&aa-groff-shortdesc; &aa-groff-desc; &aa-groff-dep; diff --git a/appendixa/less-dep.xml b/appendixa/less-dep.xml index 24a0dd80d..817486793 100644 --- a/appendixa/less-dep.xml +++ b/appendixa/less-dep.xml @@ -1,3 +1,5 @@ +<sect2><title> </title><para> </para></sect2> + <sect2> <title>Less Installation Dependencies</title> diff --git a/appendixa/less-desc.xml b/appendixa/less-desc.xml index 0bffaa836..339bc8f33 100644 --- a/appendixa/less-desc.xml +++ b/appendixa/less-desc.xml @@ -1,11 +1,10 @@ -<sect2><title>Contents of Less</title> +<sect2><title> </title><para> </para></sect2> -<para>Last checked against version &less-contversion;.</para> +<sect2><title>Descriptions</title> -<sect3><title>Program Files</title> -<para>less, lessecho and lesskey</para></sect3> +<para>Last checked against version &less-contversion;.</para> -<sect3><title>Description</title> +<sect3><title>Program file descriptions</title> <sect4><title>less</title> <para>The less program is a file pager (or text viewer). It diff --git a/appendixa/less-shortdesc.xml b/appendixa/less-shortdesc.xml new file mode 100644 index 000000000..a3bcb5cac --- /dev/null +++ b/appendixa/less-shortdesc.xml @@ -0,0 +1,16 @@ +<sect2><title>Contents of Less</title> + +<para>Last checked against version &less-contversion;.</para> + +<para>Less is a file pager, or text viewer. It displays the contents +of a file, or stream, and has the ability to scroll. Less has a few +features not included in the <userinput>more</userinput> pager, +such as the ability to scroll backwards.</para> + +<para>Less installs the following:</para> + +<sect3><title>Program Files</title> +<para>less, lessecho and lesskey</para></sect3> + +</sect2> + diff --git a/appendixa/less.xml b/appendixa/less.xml index 3a219797f..ef84b4071 100644 --- a/appendixa/less.xml +++ b/appendixa/less.xml @@ -3,6 +3,7 @@ <?dbhtml filename="less.html" dir="appendixa"?> &aa-less-down; +&aa-less-shortdesc; &aa-less-desc; &aa-less-dep; diff --git a/appendixa/m4-dep.xml b/appendixa/m4-dep.xml index 7b2921780..4f0441e59 100644 --- a/appendixa/m4-dep.xml +++ b/appendixa/m4-dep.xml @@ -1,3 +1,5 @@ +<sect2><title> </title><para> </para></sect2> + <sect2> <title>M4 Installation Dependencies</title> diff --git a/appendixa/m4-desc.xml b/appendixa/m4-desc.xml index 6367b267b..5249b303d 100644 --- a/appendixa/m4-desc.xml +++ b/appendixa/m4-desc.xml @@ -1,11 +1,10 @@ -<sect2><title>Contents of M4</title> +<sect2><title> </title><para> </para></sect2> -<para>Last checked against version &m4-contversion;.</para> +<sect2><title>Descriptions</title> -<sect3><title>Program Files</title> -<para>m4</para></sect3> +<para>Last checked against version &m4-contversion;.</para> -<sect3><title>Descriptions</title> +<sect3><title>Program file descriptions</title> <sect4><title>m4</title> <para>m4 is a macro processor. It copies input to output, expanding macros as it diff --git a/appendixa/m4-shortdesc.xml b/appendixa/m4-shortdesc.xml new file mode 100644 index 000000000..05958f75f --- /dev/null +++ b/appendixa/m4-shortdesc.xml @@ -0,0 +1,18 @@ +<sect2><title>Contents of M4</title> + +<para>Last checked against version &m4-contversion;.</para> + +<para>M4 is a macro processor. It copies input to output, expanding +macros as it goes. Macros are either built-in or user-defined and can +take any number of arguments. Besides just doing macro expansion, m4 +has built-in functions for including named files, running Unix +commands, doing integer arithmetic, manipulating text in various ways, +recursion, etc. The m4 program can be used either as a front-end to a +compiler or as a macro processor in its own right.</para> + +<para>M4 installs the following:</para> + +<sect3><title>Program Files</title> +<para>m4</para></sect3> + +</sect2> diff --git a/appendixa/m4.xml b/appendixa/m4.xml index 1195a8d05..670ff81e6 100644 --- a/appendixa/m4.xml +++ b/appendixa/m4.xml @@ -3,6 +3,7 @@ <?dbhtml filename="m4.html" dir="appendixa"?> &aa-m4-down; +&aa-m4-shortdesc; &aa-m4-desc; &aa-m4-dep; diff --git a/appendixa/nettools-dep.xml b/appendixa/nettools-dep.xml index 216f8d09d..7b783c8be 100644 --- a/appendixa/nettools-dep.xml +++ b/appendixa/nettools-dep.xml @@ -1,3 +1,5 @@ +<sect2><title> </title><para> </para></sect2> + <sect2> <title>Net-tools Installation Dependencies</title> diff --git a/appendixa/nettools-desc.xml b/appendixa/nettools-desc.xml index f6ba1cdf0..041d80e24 100644 --- a/appendixa/nettools-desc.xml +++ b/appendixa/nettools-desc.xml @@ -1,15 +1,10 @@ -<sect2><title>Contents of Net-tools</title> +<sect2><title> </title><para> </para></sect2> -<para>Last checked against version &net-tools-contversion;.</para> - -<sect3><title>Program Files</title> +<sect2><title>Descriptions</title> -<para>arp, dnsdomainname (link to hostname), domainname (link to -hostname), hostname, ifconfig, nameif, netstat, nisdomainname (link to -hostname), plipconfig, rarp, route, slattach and ypdomainname (link to -hostname)</para></sect3> +<para>Last checked against version &net-tools-contversion;.</para> -<sect3><title>Descriptions</title> +<sect3><title>Program file descriptions</title> <sect4><title>arp</title> <para>arp is used to manipulate the kernel's ARP cache, usually to add diff --git a/appendixa/nettools-shortdesc.xml b/appendixa/nettools-shortdesc.xml new file mode 100644 index 000000000..ae6bce25f --- /dev/null +++ b/appendixa/nettools-shortdesc.xml @@ -0,0 +1,17 @@ +<sect2><title>Contents of Net-tools</title> + +<para>Last checked against version &net-tools-contversion;.</para> + +<para>The Net-tools package contains a collection of programs +which form the base of Linux networking.</para> + +<para>Net-tools installs the following:</para> + +<sect3><title>Program Files</title> +<para>arp, dnsdomainname (link to hostname), domainname (link to +hostname), hostname, ifconfig, nameif, netstat, nisdomainname (link to +hostname), plipconfig, rarp, route, slattach and ypdomainname (link to +hostname)</para></sect3> + +</sect2> + diff --git a/appendixa/nettools.xml b/appendixa/nettools.xml index eb7ed016e..ed413a87a 100644 --- a/appendixa/nettools.xml +++ b/appendixa/nettools.xml @@ -3,6 +3,7 @@ <?dbhtml filename="net-tools.html" dir="appendixa"?> &aa-nettools-down; +&aa-nettools-shortdesc; &aa-nettools-desc; &aa-nettools-dep; diff --git a/chapter06/binutils-exp.xml b/chapter06/binutils-exp.xml deleted file mode 100644 index 4d875e0d5..000000000 --- a/chapter06/binutils-exp.xml +++ /dev/null @@ -1,21 +0,0 @@ -<sect2> -<title>Command explanations</title> - -<para><userinput>tooldir=/usr:</userinput> Normally, the tooldir (the -directory where the executables from binutils end up) is set to -$(exec_prefix)/$(target_alias) which expands into, for example, -/usr/i686-pc-linux-gnu. Since we only build for our own system, we don't -need this target specific directory in /usr. That setup would be used -if the system was used to cross-compile (for example -compiling a package on the Intel machine that generates code that can be -executed on Apple PowerPC machines).</para> - -<para><userinput>make tooldir=/usr install-info:</userinput> This will -install binutils' info pages.</para> - -<para><userinput>cp ../binutils-&binutils-version;/include/libiberty.h /usr/include:</userinput> -The libiberty.h header file is needed in order for certain software to -compile.</para> - -</sect2> - diff --git a/chapter06/binutils-inst.xml b/chapter06/binutils-inst.xml index 3ccc05b91..4027d7791 100644 --- a/chapter06/binutils-inst.xml +++ b/chapter06/binutils-inst.xml @@ -1,3 +1,5 @@ +<sect2><title> </title><para> </para></sect2> + <sect2><title>Installation of Binutils</title> <para>This package is known to behave badly when you have changed its @@ -7,15 +9,40 @@ that override default optimizations, such as CFLAGS and CXXFLAGS, we recommend unsetting or modifying them when building binutils. You have been warned.</para> -<para>Install Binutils by running the following commands:</para> +<para>It is recommended by the Binutils installation documentation to build +Binutils outside of the source directory. Create the build directory:</para> <para><screen><userinput>mkdir ../binutils-build && -cd ../binutils-build && -../binutils-&binutils-version;/configure --prefix=/usr --enable-shared && -make tooldir=/usr && -make tooldir=/usr install && -make tooldir=/usr install-info && -cp ../binutils-&binutils-version;/include/libiberty.h /usr/include</userinput></screen></para> +cd ../binutils-build</userinput></screen></para> + +<para>Next, prepare Binutils to be compiled:</para> + +<para><screen><userinput>../binutils-&binutils-version;/configure --prefix=/usr --enable-shared</userinput></screen></para> + +<para>Continue with compiling the package:</para> + +<para><screen><userinput>make tooldir=/usr</userinput></screen></para> + +<para>Normally, the <emphasis>tooldir</emphasis> (the directory where the +executables end up) is set to $(exec_prefix)/$(target_alias) which expands +into, for example, /usr/i686-pc-linux-gnu. Since we only build for our +own system, we don't need this target specific directory in /usr. That +setup would be used if the system was used to cross-compile (for example +compiling a package on the Intel machine that generates code that can be +executed on Apple PowerPC machines).</para> + +<para>Install the package:</para> + +<para><screen><userinput>make tooldir=/usr install</userinput></screen></para> + +<para>Install the info pages:</para> + +<para><screen><userinput>make tooldir=/usr install-info</userinput></screen></para> + +<para>Some packages require the <emphasis>libiberty</emphasis> header +in order to build. To honor those packages, install the file:</para> + +<para><screen><userinput>cp ../binutils-&binutils-version;/include/libiberty.h /usr/include</userinput></screen></para> </sect2> diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml index 095f044d1..2acece44f 100644 --- a/chapter06/binutils.xml +++ b/chapter06/binutils.xml @@ -5,9 +5,8 @@ <screen>Estimated build time: &binutils-time; Estimated required disk space: &binutils-compsize;</screen> -&c6-binutils-inst; -&c6-binutils-exp; -&aa-binutils-desc; +&aa-binutils-shortdesc; &aa-binutils-dep; +&c6-binutils-inst; </sect1> diff --git a/chapter06/bison-inst.xml b/chapter06/bison-inst.xml index 362dcbf8a..d44fe385c 100644 --- a/chapter06/bison-inst.xml +++ b/chapter06/bison-inst.xml @@ -1,11 +1,19 @@ +<sect2><title> </title><para> </para></sect2> + <sect2> <title>Installation of Bison</title> -<para>Install Bison by running the following commands:</para> +<para>Prepare Bison to be compiled:</para> + +<para><screen><userinput>./configure --prefix=/usr</userinput></screen></para> + +<para>Continue with compiling the package:</para> + +<para><screen><userinput>make</userinput></screen></para> + +<para>Finish installing the package:</para> -<para><screen><userinput>./configure --prefix=/usr && -make && -make install</userinput></screen></para> +<para><screen><userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/bison.xml b/chapter06/bison.xml index 7d4c6129e..3e469dcc9 100644 --- a/chapter06/bison.xml +++ b/chapter06/bison.xml @@ -5,9 +5,9 @@ <screen>Estimated build time: &bison-time; Estimated required disk space: &bison-compsize;</screen> -&c6-bison-inst; -&aa-bison-desc; +&aa-bison-shortdesc; &aa-bison-dep; +&c6-bison-inst; </sect1> diff --git a/chapter06/fileutils-inst.xml b/chapter06/fileutils-inst.xml index 79ca45d1d..4e2345135 100644 --- a/chapter06/fileutils-inst.xml +++ b/chapter06/fileutils-inst.xml @@ -1,12 +1,26 @@ +<sect2><title> </title><para> </para></sect2> + <sect2> <title>Installation of Fileutils</title> -<para>Install Fileutils by running the following commands:</para> +<para>Prepare Fileutils to be compiled:</para> + +<para><screen><userinput>./configure --prefix=/usr --bindir=/bin</userinput></screen></para> + +<para>Continue with compiling the package:</para> + +<para><screen><userinput>make</userinput></screen></para> + +<para>Install the package:</para> + +<para><screen><userinput>make install</userinput></screen></para> + +<para>Some packages hardwire the path to the +<userinput>install</userinput> program as +<emphasis>/usr/bin/install</emphasis>. Create a symlink +to account for this:</para> -<para><screen><userinput>./configure --prefix=/usr --bindir=/bin && -make && -make install && -ln -s ../../bin/install /usr/bin</userinput></screen></para> +<para><screen><userinput>ln -s ../../bin/install /usr/bin</userinput></screen></para> </sect2> diff --git a/chapter06/fileutils.xml b/chapter06/fileutils.xml index 2d9749dec..5b0d77af4 100644 --- a/chapter06/fileutils.xml +++ b/chapter06/fileutils.xml @@ -5,8 +5,8 @@ <screen>Estimated build time: &fileutils-time; Estimated required disk space: &fileutils-compsize;</screen> -&c6-fileutils-inst; -&aa-fileutils-desc; +&aa-fileutils-shortdesc; &aa-fileutils-dep; +&c6-fileutils-inst; </sect1> diff --git a/chapter06/flex-inst.xml b/chapter06/flex-inst.xml index bdd9ff3c2..92634e350 100644 --- a/chapter06/flex-inst.xml +++ b/chapter06/flex-inst.xml @@ -1,20 +1,30 @@ +<sect2><title> </title><para> </para></sect2> + <sect2> <title>Installation of Flex</title> -<para>Install Flex by running the following commands:</para> +<para>Prepare Flex to be compiled:</para> + +<para><screen><userinput>./configure --prefix=/usr</userinput></screen></para> + +<para>Continue with compiling the package:</para> + +<para><screen><userinput>make</userinput></screen></para> + +<para>Install the package:</para> + +<para><screen><userinput>make install</userinput></screen></para> -<para><screen><userinput>./configure --prefix=/usr && -make && -make install && -ln -s libfl.a /usr/lib/libl.a</userinput></screen></para> +<para>There are which packages expect to find the flex library +in the <filename>/usr/lib</filename> directory. Create a symlink +to account for this:</para> -<para>Some programs don't know about flex and try to find the lex program -(flex is a (better) alternative for lex). So to please those few -programs out there we'll create a bash script called lex that calls flex -and have it emulate lex.</para> +<para><screen><userinput>ln -s libfl.a /usr/lib/libl.a</userinput></screen></para> -<para>Create a new file <filename>/usr/bin/lex</filename> by running the -following:</para> +<para>Some programs don't know about flex and try to find the lex +program (flex is a (better) alternative for lex). To please those +programs, create a shell script named lex which calls flex in +emulation mode:</para> <para><screen><userinput>cat > /usr/bin/lex << "EOF"</userinput> #!/bin/sh diff --git a/chapter06/flex.xml b/chapter06/flex.xml index b333d82f5..bf7ddd59f 100644 --- a/chapter06/flex.xml +++ b/chapter06/flex.xml @@ -5,8 +5,8 @@ <screen>Estimated build time: &flex-time; Estimated required disk space: &flex-compsize;</screen> -&c6-flex-inst; -&aa-flex-desc; +&aa-flex-shortdesc; &aa-flex-dep; +&c6-flex-inst; </sect1> diff --git a/chapter06/gettext-inst.xml b/chapter06/gettext-inst.xml index 8eb08d5b3..19d883e0e 100644 --- a/chapter06/gettext-inst.xml +++ b/chapter06/gettext-inst.xml @@ -1,11 +1,19 @@ +<sect2><title> </title><para> </para></sect2> + <sect2> <title>Installation of Gettext</title> -<para>Install Gettext by running the following commands:</para> +<para>Prepare Gettext to be compiled:</para> + +<para><screen><userinput>./configure --prefix=/usr</userinput></screen></para> + +<para>Continue with compiling the package:</para> + +<para><screen><userinput>make</userinput></screen></para> + +<para>Finish installing the package:</para> -<para><screen><userinput>./configure --prefix=/usr && -make && -make install</userinput></screen></para> +<para><screen><userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/gettext.xml b/chapter06/gettext.xml index b54146e27..1c240346d 100644 --- a/chapter06/gettext.xml +++ b/chapter06/gettext.xml @@ -5,8 +5,8 @@ <screen>Estimated build time: &gettext-time; Estimated required disk space: &gettext-compsize;</screen> -&c6-gettext-inst; -&aa-gettext-desc; +&aa-gettext-shortdesc; &aa-gettext-dep; +&c6-gettext-inst; </sect1> diff --git a/chapter06/groff-exp.xml b/chapter06/groff-exp.xml deleted file mode 100644 index 99a7c8281..000000000 --- a/chapter06/groff-exp.xml +++ /dev/null @@ -1,9 +0,0 @@ -<sect2> -<title>Command explanations</title> - -<para><userinput>ln -s ...</userinput>: These symlinks are needed for some -<userinput>xman</userinput> and other groff/man document programs to work -properly.</para> - -</sect2> - diff --git a/chapter06/groff-inst.xml b/chapter06/groff-inst.xml index bb995fa75..4c2e6d4ef 100644 --- a/chapter06/groff-inst.xml +++ b/chapter06/groff-inst.xml @@ -1,12 +1,24 @@ +<sect2><title> </title><para> </para></sect2> + <sect2> <title>Installation of Groff</title> -<para>Install Groff by running the following commands:</para> +<para>Prepare Groff to be compiled:</para> + +<para><screen><userinput>./configure --prefix=/usr</userinput></screen></para> + +<para>Continue with compiling the package:</para> + +<para><screen><userinput>make</userinput></screen></para> + +<para>Install the package:</para> + +<para><screen><userinput>make install</userinput></screen></para> + +<para>Some groff/man document programs, such as <userinput>xman</userinput>, +will not work work properly without the following symlinks:</para> -<para><screen><userinput>./configure --prefix=/usr && -make && -make install && -ln -s soelim /usr/bin/zsoelim && +<para><screen><userinput>ln -s soelim /usr/bin/zsoelim && ln -s eqn /usr/bin/geqn && ln -s tbl /usr/bin/gtbl</userinput></screen></para> diff --git a/chapter06/groff.xml b/chapter06/groff.xml index 1308f2058..6699b0c81 100644 --- a/chapter06/groff.xml +++ b/chapter06/groff.xml @@ -5,10 +5,9 @@ <screen>Estimated build time: &groff-time; Estimated required disk space: &groff-compsize;</screen> -&c6-groff-inst; -&c6-groff-exp; -&aa-groff-desc; +&aa-groff-shortdesc; &aa-groff-dep; +&c6-groff-inst; </sect1> diff --git a/chapter06/less-inst.xml b/chapter06/less-inst.xml index 592c598c2..99e67233a 100644 --- a/chapter06/less-inst.xml +++ b/chapter06/less-inst.xml @@ -1,11 +1,19 @@ +<sect2><title> </title><para> </para></sect2> + <sect2> <title>Installation of Less</title> -<para>Install Less by running the following commands:</para> +<para>Prepare Less to be compiled:</para> + +<para><screen><userinput>./configure --prefix=/usr --bindir=/bin --sysconfdir=/etc</userinput></screen></para> + +<para>Continue with compiling the package:</para> + +<para><screen><userinput>make</userinput></screen></para> + +<para>Finish installing the package:</para> -<para><screen><userinput>./configure --prefix=/usr --bindir=/bin --sysconfdir=/etc && -make && -make install</userinput></screen></para> +<para><screen><userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/less.xml b/chapter06/less.xml index a2d56eb07..e65ad3072 100644 --- a/chapter06/less.xml +++ b/chapter06/less.xml @@ -5,9 +5,9 @@ <screen>Estimated build time: &less-time; Estimated required disk space: &less-compsize;</screen> -&c6-less-inst; -&aa-less-desc; +&aa-less-shortdesc; &aa-less-dep; +&c6-less-inst; </sect1> diff --git a/chapter06/m4-inst.xml b/chapter06/m4-inst.xml index dc1e367b1..b1b9683cd 100644 --- a/chapter06/m4-inst.xml +++ b/chapter06/m4-inst.xml @@ -1,11 +1,19 @@ +<sect2><title> </title><para> </para></sect2> + <sect2> <title>Installation of M4</title> -<para>Install M4 by running the following commands:</para> +<para>Prepare M4 to be compiled:</para> + +<para><screen><userinput>./configure --prefix=/usr</userinput></screen></para> + +<para>Continue with compiling the package:</para> + +<para><screen><userinput>make</userinput></screen></para> + +<para>Finish installing the package:</para> -<para><screen><userinput>./configure --prefix=/usr && -make && -make install</userinput></screen></para> +<para><screen><userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/m4.xml b/chapter06/m4.xml index 1f20e7be1..b68c90333 100644 --- a/chapter06/m4.xml +++ b/chapter06/m4.xml @@ -5,9 +5,9 @@ <screen>Estimated build time: &m4-time; Estimated required disk space: &m4-compsize;</screen> -&c6-m4-inst; -&aa-m4-desc; +&aa-m4-shortdesc; &aa-m4-dep; +&c6-m4-inst; </sect1> diff --git a/chapter06/nettools-exp.xml b/chapter06/nettools-exp.xml deleted file mode 100644 index 0f8216665..000000000 --- a/chapter06/nettools-exp.xml +++ /dev/null @@ -1,16 +0,0 @@ -<sect2> -<title>Command explanations</title> - -<para><userinput>make update:</userinput> This does the same as a -<userinput>make install</userinput> with the exception that make update -doesn't make backups of files it's replacing. One of the things -net-tools replaces is sh-utils's version of -<filename>/bin/hostname</filename> (net-tools's version is far better -than sh-utils's version).</para> - -<para>Also, if you decide to reinstall this package at some point in the -future, a <userinput>make update</userinput> won't backup all the files -from a previous net-tools installation.</para> - -</sect2> - diff --git a/chapter06/nettools-inst.xml b/chapter06/nettools-inst.xml index 2a00423bf..f2a6bf127 100644 --- a/chapter06/nettools-inst.xml +++ b/chapter06/nettools-inst.xml @@ -1,17 +1,8 @@ +<sect2><title> </title><para> </para></sect2> + <sect2> <title>Installation of Net-tools</title> -<para>Install Net-tools by running the following commands:</para> - -<para><screen><userinput>make && -make update</userinput></screen></para> - -<para>If you want to accept all the default answers, you can run these -commands instead:</para> - -<para><screen><userinput>yes "" | make && -make update</userinput></screen></para> - <para>If you don't know what to answer to all the questions asked during the <userinput>make</userinput> phase, then just accept the defaults, which will be just fine in the majority of the cases. What you are asked here @@ -24,5 +15,27 @@ still need to actually enable these protocols in the kernel. What you do here is merely telling the programs to be able to use those protocols, but it's up to the kernel to make them available to the system.</para> +<para>If you intend to accept the default settings, you may skip +the questions generated by <emphasis>make</emphasis> by runing +<userinput>yes "" | make</userinput>.</para> + +<para>Compile the package:</para> + +<para><screen><userinput>make</userinput></screen></para> + +<para>Finish installing the package:</para> + +<para><screen><userinput>make update</userinput></screen></para> + +<para>The <emphasis>update</emphasis> option to <userinput>make</userinput> +works similarly to the <emphasis>install</emphasis> option, with one +exception: it doesn't make backups of files it's replacing. One of the +things net-tools replaces is sh-utils's version of /bin/hostname +(net-tools's version is far better than sh-utils's version).</para> + +<para>Also, if you decide to reinstall this package at some point in the +future, a make update won't backup all the files from a previous net-tools +installation.</para> + </sect2> diff --git a/chapter06/nettools.xml b/chapter06/nettools.xml index 48bcaf4b6..417bd502d 100644 --- a/chapter06/nettools.xml +++ b/chapter06/nettools.xml @@ -5,10 +5,9 @@ <screen>Estimated build time: &net-tools-time; Estimated required disk space: &net-tools-compsize;</screen> -&c6-nettools-inst; -&c6-nettools-exp; -&aa-nettools-desc; +&aa-nettools-shortdesc; &aa-nettools-dep; +&c6-nettools-inst; </sect1> diff --git a/chapter06/sed-inst.xml b/chapter06/sed-inst.xml index 0c1923b24..4cfa45522 100644 --- a/chapter06/sed-inst.xml +++ b/chapter06/sed-inst.xml @@ -1,11 +1,19 @@ +<sect2><title> </title><para> </para></sect2> + <sect2> <title>Installation of Sed</title> -<para>Install Sed by running the following commands:</para> +<para>Prepare Sed to be compiled:</para> + +<para><screen><userinput>./configure --prefix=/usr --bindir=/bin</userinput></screen></para> + +<para>Continue with compiling the package:</para> + +<para><screen><userinput>make</userinput></screen></para> + +<para>Finish installing the package:</para> -<para><screen><userinput>./configure --prefix=/usr --bindir=/bin && -make && -make install</userinput></screen></para> +<para><screen><userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/sed.xml b/chapter06/sed.xml index 888134dca..9cdcf6b69 100644 --- a/chapter06/sed.xml +++ b/chapter06/sed.xml @@ -5,8 +5,8 @@ <screen>Estimated build time: &sed-time; Estimated required disk space: &sed-compsize;</screen> -&c6-sed-inst; -&aa-sed-desc; +&aa-sed-shortdesc; &aa-sed-dep; +&c6-sed-inst; </sect1> diff --git a/chapter06/shellutils-exp.xml b/chapter06/shellutils-exp.xml deleted file mode 100644 index 3c7e56ef9..000000000 --- a/chapter06/shellutils-exp.xml +++ /dev/null @@ -1,11 +0,0 @@ -<sect2> -<title>Command explanations</title> - -<para><userinput>patch -Np1 -i ../sh-utils-&sh-utils-hostname-patch-version;.patch:</userinput> This patch -suppresses the build of the hostname program which will be installed -later with the net-tools package. The hostname program from the net-tools -package is a much better version (and in some cases even required since it -supports options that are needed by some programs such as XFree86).</para> - -</sect2> - diff --git a/chapter06/shellutils-inst.xml b/chapter06/shellutils-inst.xml index 741911f09..d8060eb0a 100644 --- a/chapter06/shellutils-inst.xml +++ b/chapter06/shellutils-inst.xml @@ -1,16 +1,33 @@ +<sect2><title> </title><para> </para></sect2> + <sect2> <title>Installation of Sh-utils</title> <para>This package requires its hostname-patch to be applied before you -can install it.</para> +can install it. This patch suppresses the build of the hostname program +which will be installed later with the net-tools package. The hostname +program from the net-tools package is a much better version (and in some +cases even required since it supports options that are needed by some +programs such as XFree86). Apply the patch:</para> + +<para><screen><userinput>patch -Np1 -i ../sh-utils-&sh-utils-hostname-patch-version;.patch</userinput></screen></para> + +<para>Prepare Shellutils to be compiled:</para> + +<para><screen><userinput>./configure --prefix=/usr</userinput></screen></para> + +<para>Continue with compiling the package:</para> + +<para><screen><userinput>make</userinput></screen></para> + +<para>Install the package:</para> + +<para><screen><userinput>make install</userinput></screen></para> -<para>Install Sh-utils by running the following commands:</para> +<para>Finally, move some of the programs to more appropriate +locations:</para> -<para><screen><userinput>patch -Np1 -i ../sh-utils-&sh-utils-hostname-patch-version;.patch && -./configure --prefix=/usr && -make && -make install && -mv /usr/bin/{basename,date,echo,false,pwd} /bin && +<para><screen><userinput>mv /usr/bin/{basename,date,echo,false,pwd} /bin && mv /usr/bin/{sleep,stty,su,test,true,uname} /bin && mv /usr/bin/chroot /usr/sbin</userinput></screen></para> diff --git a/chapter06/shellutils.xml b/chapter06/shellutils.xml index 4d238f972..eb5d1df03 100644 --- a/chapter06/shellutils.xml +++ b/chapter06/shellutils.xml @@ -5,9 +5,8 @@ <screen>Estimated build time: &sh-utils-time; Estimated required disk space: &sh-utils-compsize;</screen> -&c6-shellutils-inst; -&c6-shellutils-exp; -&aa-shellutils-desc; +&aa-shellutils-shortdesc; &aa-shellutils-dep; +&c6-shellutils-inst; </sect1> diff --git a/chapter06/textutils-inst.xml b/chapter06/textutils-inst.xml index d9e78da0f..511e52bb5 100644 --- a/chapter06/textutils-inst.xml +++ b/chapter06/textutils-inst.xml @@ -1,12 +1,24 @@ +<sect2><title> </title><para> </para></sect2> + <sect2> <title>Installation of Textutils</title> -<para>Install Textutils by running the following commands:</para> +<para>Prepare Textutils to be compiled:</para> + +<para><screen><userinput>./configure --prefix=/usr</userinput></screen></para> + +<para>Continue with compiling the package:</para> + +<para><screen><userinput>make</userinput></screen></para> + +<para>Install the package:</para> + +<para><screen><userinput>make install</userinput></screen></para> + +<para>Finally, complete the installation of this package +by moving some of its programs to the appropriate directory:</para> -<para><screen><userinput>./configure --prefix=/usr && -make && -make install && -mv /usr/bin/{cat,head} /bin</userinput></screen></para> +<para><screen><userinput>mv /usr/bin/{cat,head} /bin</userinput></screen></para> </sect2> diff --git a/chapter06/textutils.xml b/chapter06/textutils.xml index a11c403b2..30f89194e 100644 --- a/chapter06/textutils.xml +++ b/chapter06/textutils.xml @@ -5,8 +5,8 @@ <screen>Estimated build time: &textutils-time; Estimated required disk space: &textutils-compsize;</screen> -&c6-textutils-inst; -&aa-textutils-desc; +&aa-textutils-shortdesc; &aa-textutils-dep; +&c6-textutils-inst; </sect1> diff --git a/entities/binutils.ent b/entities/binutils.ent index 18963b9b6..62e1aaa60 100644 --- a/entities/binutils.ent +++ b/entities/binutils.ent @@ -5,7 +5,6 @@ <!ENTITY c6-binutils SYSTEM "../chapter06/binutils.xml"> <!ENTITY c6-binutils-inst SYSTEM "../chapter06/binutils-inst.xml"> -<!ENTITY c6-binutils-exp SYSTEM "../chapter06/binutils-exp.xml"> <!ENTITY aa-binutils SYSTEM "../appendixa/binutils.xml"> <!ENTITY aa-binutils-shortdesc SYSTEM "../appendixa/binutils-shortdesc.xml"> diff --git a/entities/bison.ent b/entities/bison.ent index 4e57c772f..36c1b78ba 100644 --- a/entities/bison.ent +++ b/entities/bison.ent @@ -7,6 +7,7 @@ <!ENTITY aa-bison-desc SYSTEM "../appendixa/bison-desc.xml"> <!ENTITY aa-bison-dep SYSTEM "../appendixa/bison-dep.xml"> <!ENTITY aa-bison-down SYSTEM "../appendixa/bison-down.xml"> +<!ENTITY aa-bison-shortdesc SYSTEM "../appendixa/bison-shortdesc.xml"> <!ENTITY bison-version "1.875"> <!ENTITY bison-depversion "1.31"> diff --git a/entities/flex.ent b/entities/flex.ent index c09f37ca8..577619c97 100644 --- a/entities/flex.ent +++ b/entities/flex.ent @@ -7,6 +7,7 @@ <!ENTITY aa-flex-desc SYSTEM "../appendixa/flex-desc.xml"> <!ENTITY aa-flex-dep SYSTEM "../appendixa/flex-dep.xml"> <!ENTITY aa-flex-down SYSTEM "../appendixa/flex-down.xml"> +<!ENTITY aa-flex-shortdesc SYSTEM "../appendixa/flex-shortdesc.xml"> <!ENTITY flex-version "2.5.4a"> <!ENTITY flex-depversion "2.5.4a"> diff --git a/entities/gettext.ent b/entities/gettext.ent index c68cc3318..757c8b05e 100644 --- a/entities/gettext.ent +++ b/entities/gettext.ent @@ -7,6 +7,7 @@ <!ENTITY aa-gettext-desc SYSTEM "../appendixa/gettext-desc.xml"> <!ENTITY aa-gettext-dep SYSTEM "../appendixa/gettext-dep.xml"> <!ENTITY aa-gettext-down SYSTEM "../appendixa/gettext-down.xml"> +<!ENTITY aa-gettext-shortdesc SYSTEM "../appendixa/gettext-shortdesc.xml"> <!ENTITY gettext-version "0.11.5"> <!ENTITY gettext-depversion "0.10.40"> diff --git a/entities/groff.ent b/entities/groff.ent index 3da732a1a..30bfb0f0c 100644 --- a/entities/groff.ent +++ b/entities/groff.ent @@ -8,6 +8,7 @@ <!ENTITY aa-groff-desc SYSTEM "../appendixa/groff-desc.xml"> <!ENTITY aa-groff-dep SYSTEM "../appendixa/groff-dep.xml"> <!ENTITY aa-groff-down SYSTEM "../appendixa/groff-down.xml"> +<!ENTITY aa-groff-shortdesc SYSTEM "../appendixa/groff-shortdesc.xml"> <!ENTITY groff-version "1.18.1"> <!ENTITY groff-depversion "1.17.2"> diff --git a/entities/less.ent b/entities/less.ent index c2d266ab4..958a0c457 100644 --- a/entities/less.ent +++ b/entities/less.ent @@ -7,6 +7,7 @@ <!ENTITY aa-less-desc SYSTEM "../appendixa/less-desc.xml"> <!ENTITY aa-less-dep SYSTEM "../appendixa/less-dep.xml"> <!ENTITY aa-less-down SYSTEM "../appendixa/less-down.xml"> +<!ENTITY aa-less-shortdesc SYSTEM "../appendixa/less-shortdesc.xml"> <!ENTITY less-version "378"> <!ENTITY less-depversion "358"> diff --git a/entities/m4.ent b/entities/m4.ent index 151c3e294..3536ec310 100644 --- a/entities/m4.ent +++ b/entities/m4.ent @@ -7,6 +7,7 @@ <!ENTITY aa-m4-desc SYSTEM "../appendixa/m4-desc.xml"> <!ENTITY aa-m4-dep SYSTEM "../appendixa/m4-dep.xml"> <!ENTITY aa-m4-down SYSTEM "../appendixa/m4-down.xml"> +<!ENTITY aa-m4-shortdesc SYSTEM "../appendixa/m4-shortdesc.xml"> <!ENTITY m4-version "1.4"> <!ENTITY m4-depversion "1.4"> diff --git a/entities/nettools.ent b/entities/nettools.ent index 1505c8c78..20bdfd9a4 100644 --- a/entities/nettools.ent +++ b/entities/nettools.ent @@ -2,12 +2,12 @@ <!ENTITY c6-nettools SYSTEM "../chapter06/nettools.xml"> <!ENTITY c6-nettools-inst SYSTEM "../chapter06/nettools-inst.xml"> -<!ENTITY c6-nettools-exp SYSTEM "../chapter06/nettools-exp.xml"> <!ENTITY aa-nettools SYSTEM "../appendixa/nettools.xml"> <!ENTITY aa-nettools-desc SYSTEM "../appendixa/nettools-desc.xml"> <!ENTITY aa-nettools-dep SYSTEM "../appendixa/nettools-dep.xml"> <!ENTITY aa-nettools-down SYSTEM "../appendixa/nettools-down.xml"> +<!ENTITY aa-nettools-shortdesc SYSTEM "../appendixa/nettools-shortdesc.xml"> <!ENTITY net-tools-version "1.60"> <!ENTITY net-tools-depversion "1.60"> diff --git a/entities/shellutils.ent b/entities/shellutils.ent index 89a80082e..f3813d6fe 100644 --- a/entities/shellutils.ent +++ b/entities/shellutils.ent @@ -7,7 +7,6 @@ <!ENTITY c6-shellutils SYSTEM "../chapter06/shellutils.xml"> <!ENTITY c6-shellutils-inst SYSTEM "../chapter06/shellutils-inst.xml"> -<!ENTITY c6-shellutils-exp SYSTEM "../chapter06/shellutils-exp.xml"> <!ENTITY aa-shellutils SYSTEM "../appendixa/shellutils.xml"> <!ENTITY aa-shellutils-shortdesc SYSTEM "../appendixa/shellutils-shortdesc.xml"> |