cvs commit: LFS/BOOK/chapter06 autoconf-inst.xml automake-inst.xml bash-inst.xml bin86-inst.xml bzip2-inst.xml diffutils-inst.xml e2fsprogs-inst.xml ed-inst.xml file-inst.xml grep-inst.xml gzip-inst.xml kbd-inst.xml libtool-inst.xml lilo-inst.xml make-inst.xml man-inst.xml texinfo-inst.xml

timothy at linuxfromscratch.org timothy at linuxfromscratch.org
Sun Jan 19 07:36:48 PST 2003


timothy     03/01/19 10:36:48

  Modified:    BOOK     index.xml
               BOOK/chapter06 autoconf-inst.xml automake-inst.xml
                        bash-inst.xml bin86-inst.xml bzip2-inst.xml
                        diffutils-inst.xml e2fsprogs-inst.xml ed-inst.xml
                        file-inst.xml grep-inst.xml gzip-inst.xml
                        kbd-inst.xml libtool-inst.xml lilo-inst.xml
                        make-inst.xml man-inst.xml texinfo-inst.xml
  Log:
  Chapter 6 cleanup after conversions.
  
  Revision  Changes    Path
  1.543     +2 -2      LFS/BOOK/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/index.xml,v
  retrieving revision 1.542
  retrieving revision 1.543
  diff -u -r1.542 -r1.543
  --- index.xml	18 Jan 2003 23:23:45 -0000	1.542
  +++ index.xml	19 Jan 2003 15:36:47 -0000	1.543
  @@ -4,8 +4,8 @@
   
   <!ENTITY book SYSTEM "book/book.xml">
   
  -<!ENTITY version "20030118">
  -<!ENTITY releasedate "January 18th, 2003">
  +<!ENTITY version "20030119">
  +<!ENTITY releasedate "January 19th, 2003">
   
   <!ENTITY ftp-root "ftp://ftp.linuxfromscratch.org">
   <!ENTITY http-root "http://ftp.linuxfromscratch.org">
  
  
  
  1.9       +1 -2      LFS/BOOK/chapter06/autoconf-inst.xml
  
  Index: autoconf-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/autoconf-inst.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- autoconf-inst.xml	16 Jan 2003 22:33:06 -0000	1.8
  +++ autoconf-inst.xml	19 Jan 2003 15:36:47 -0000	1.9
  @@ -4,8 +4,7 @@
   
   <para>Prepare Autoconf to be compiled:</para>
   
  -<para><screen><userinput>
  -./configure --prefix=/usr</userinput></screen></para>
  +<para><screen><userinput>./configure --prefix=/usr</userinput></screen></para>
   
   <para>Continue with compiling the package:</para>
   
  
  
  
  1.10      +3 -5      LFS/BOOK/chapter06/automake-inst.xml
  
  Index: automake-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/automake-inst.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- automake-inst.xml	17 Jan 2003 01:11:16 -0000	1.9
  +++ automake-inst.xml	19 Jan 2003 15:36:47 -0000	1.10
  @@ -5,16 +5,14 @@
   
   <para>Prepare Automake to be compiled:</para>
   
  -<para><screen><userinput>
  -./configure --prefix=/usr</userinput></screen></para>
  +<para><screen><userinput>./configure --prefix=/usr</userinput></screen></para>
   
   <para>Continue with compiling and installing the package:</para>
   
   <para><screen><userinput>make install</userinput></screen></para>
   
  -<para>Create necessary symbolic link:</para>
  +<para>Create a necessary symbolic link:</para>
   
  -<para><screen><userinput>
  -ln -s automake-1.7 /usr/share/automake</userinput></screen></para>
  +<para><screen><userinput>ln -s automake-1.7 /usr/share/automake</userinput></screen></para>
   
   </sect2>
  
  
  
  1.23      +1 -2      LFS/BOOK/chapter06/bash-inst.xml
  
  Index: bash-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/bash-inst.xml,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- bash-inst.xml	17 Jan 2003 01:12:37 -0000	1.22
  +++ bash-inst.xml	19 Jan 2003 15:36:47 -0000	1.23
  @@ -5,8 +5,7 @@
   
   <para>Prepare Bash to be compiled:</para>
   
  -<para><screen><userinput>
  -./configure --prefix=/usr --bindir=/bin</userinput></screen></para>
  +<para><screen><userinput>./configure --prefix=/usr --bindir=/bin</userinput></screen></para>
   
   <para>Continue with compiling the package:</para>
   
  
  
  
  1.11      +1 -2      LFS/BOOK/chapter06/bin86-inst.xml
  
  Index: bin86-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/bin86-inst.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- bin86-inst.xml	17 Jan 2003 02:24:08 -0000	1.10
  +++ bin86-inst.xml	19 Jan 2003 15:36:47 -0000	1.11
  @@ -20,8 +20,7 @@
   
   <para>And finish off installing the package:</para>
   
  -<para><screen><userinput>
  -make PREFIX=/usr install</userinput></screen></para>
  +<para><screen><userinput>make PREFIX=/usr install</userinput></screen></para>
   
   </sect2>
   
  
  
  
  1.35      +21 -25    LFS/BOOK/chapter06/bzip2-inst.xml
  
  Index: bzip2-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/bzip2-inst.xml,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- bzip2-inst.xml	17 Jan 2003 02:59:00 -0000	1.34
  +++ bzip2-inst.xml	19 Jan 2003 15:36:47 -0000	1.35
  @@ -3,38 +3,34 @@
   <sect2>
   <title>Installation of Bzip2</title>
   
  -<para>Compile the package:</para>
  -<para><screen><userinput>
  -make -f Makefile-libbz2_so &&
  -make
  -</userinput></screen></para>
  -
  -<para>And finish off installing the package:</para>
  +<para>Begin compiling the package:</para>
   
  -<para><screen><userinput>
  -make install</userinput></screen></para>
  +<para><screen><userinput>make -f Makefile-libbz2_so</userinput></screen></para>
   
  -<para>Copy the Bzip2 binary into the /bin directory, make some
  -  neccessary symbolic links and clean up.</para>
  +<para>The <emphasis>-f</emphasis> flag will cause bzip2 to be built
  +using a different <filename>Makefile</filename> file, in this case the
  +<filename>Makefile-libbz2_so</filename> file, which creates a dynamic
  +<filename>libbz2.so</filename> library and links the bzip2 utilities
  +against it.</para>
   
  -<para><screen><userinput>
  -cp bzip2-shared /bin/bzip2 &&
  +<para>Continue 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>Copy the Bzip2 binary into the <filename
  +class="directory">/bin</filename> directory, make some
  +neccessary symbolic links and clean up.</para>
  +
  +<para><screen><userinput>cp bzip2-shared /bin/bzip2 &&
   cp -a libbz2.so* /lib &&
   ln -s ../../lib/libbz2.so.1.0 /usr/lib/libbz2.so &&
   rm /usr/bin/{bunzip2,bzcat,bzip2} &&
   mv /usr/bin/{bzip2recover,bzless,bzmore} /bin &&
   ln -s bzip2 /bin/bunzip2 &&
  -ln -s bzip2 /bin/bzcat
  -</userinput></screen></para>
  -
  -</sect2>
  -
  -<sect2>
  -<title>Command explanations</title>
  -
  -<para><userinput>make -f Makefile-libbz2_so:</userinput> This will cause bzip2
  -to be built using a different Makefile file, in this case the
  -Makefile-libbz2_so file, which creates a dynamic libbz2.so library and
  -links the bzip2 utilities against it.</para>
  +ln -s bzip2 /bin/bzcat</userinput></screen></para>
   
   </sect2>
  
  
  
  1.9       +1 -2      LFS/BOOK/chapter06/diffutils-inst.xml
  
  Index: diffutils-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/diffutils-inst.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- diffutils-inst.xml	17 Jan 2003 04:06:13 -0000	1.8
  +++ diffutils-inst.xml	19 Jan 2003 15:36:47 -0000	1.9
  @@ -5,8 +5,7 @@
   
   <para>Prepare Diffutils to be compiled:</para>
   
  -<para><screen><userinput>
  -./configure --prefix=/usr</userinput></screen></para>
  +<para><screen><userinput>./configure --prefix=/usr</userinput></screen></para>
   
   <para>Continue with compiling the package:</para>
   
  
  
  
  1.19      +40 -35    LFS/BOOK/chapter06/e2fsprogs-inst.xml
  
  Index: e2fsprogs-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/e2fsprogs-inst.xml,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- e2fsprogs-inst.xml	17 Jan 2003 04:31:55 -0000	1.18
  +++ e2fsprogs-inst.xml	19 Jan 2003 15:36:47 -0000	1.19
  @@ -3,49 +3,54 @@
   <sect2>
   <title>Installation of E2fsprogs</title>
   
  +<para>It is recommended to build E2fsprogs outside of the
  +source tree. Create the build directory:</para>
  +
  +<para><screen><userinput>mkdir ../e2fsprogs-build &&
  +cd ../e2fsprogs-build</userinput></screen></para>
  +
   <para>Prepare E2fsprogs to be compiled:</para>
   
  -<para><screen><userinput>
  -mkdir ../e2fsprogs-build &&
  -cd ../e2fsprogs-build &&
  -../e2fsprogs-&e2fsprogs-version;/configure --prefix=/usr --with-root-prefix="" \
  -    --enable-elf-shlibs
  -</userinput></screen></para>
  +<para><screen><userinput>../e2fsprogs-&e2fsprogs-version;/configure --prefix=/usr --with-root-prefix="" \
  +    --enable-elf-shlibs</userinput></screen></para>
  +
  +<para>The meaning of the configure options are:</para>
  +
  +<itemizedlist>
  +
  +<listitem><para><userinput>--with-root-prefix="":</userinput> This option
  +is used because of the e2fsprogs Makefile. Some programs are essential for
  +system use when, for example, <filename class="directory">/usr</filename>
  +isn't mounted (like the e2fsck program). These  programs and libraries,
  +therefore, belong in directories like <filename
  +class="directory">/lib</filename> and <filename
  +class="directory">/sbin</filename>. If this option isn't passed to
  +E2fsprogs's configure, the programs are placed in the <filename
  +class="directory">/usr</filename> directory, which is not what we
  +want.</para></listitem>
  +
  +<listitem><para><userinput>--enable-elf-shlibs:</userinput> This creates
  +the shared libraries which some programs in this package make use
  +of.</para></listitem>
  +
  +</itemizedlist>
   
   <para>Continue with compiling the package:</para>
   
   <para><screen><userinput>make</userinput></screen></para>
   
  -<para>And finish off installing the package:</para>
  +<para>Begin installing the package:</para>
  +
  +<para><screen><userinput>make install</userinput></screen></para>
  +
  +<para>Install the shared libraries:</para>
  +
  +<para><screen><userinput>make install-libs</userinput></screen></para>
  +
  +<para>Update the <filename>/usr/share/info/dir</filename> file to
  +include E2fsprogs' info pages in the index:</para>
   
  -<para><screen><userinput>
  -make install &&
  -make install-libs &&
  -install-info /usr/share/info/libext2fs.info /usr/share/info/dir
  -</userinput></screen></para>
  -
  -</sect2>
  -
  -<sect2>
  -<title>Command explanations</title>
  -
  -<para><userinput>--with-root-prefix="":</userinput> The
  -reason for supplying this option is because of the setup of the
  -e2fsprogs Makefile. Some programs are essential for system use when,
  -for example, /usr isn't mounted (like the e2fsck program). These 
  -programs and libraries, therefore, belong in directories like /lib and 
  -/sbin. If this option isn't passed to E2fsprogs's configure, it places 
  -these programs in /usr, which is not what we want.</para>
  -
  -<para><userinput>--enable-elf-shlibs:</userinput> This creates shared
  -libraries that some programs in this package can make use of.</para>
  -
  -<para><userinput>make install-libs:</userinput> This installs the shared
  -libraries that are built.</para>
  -
  -<para><userinput>install-info...:</userinput> This updates the
  -<filename>/usr/share/info/dir</filename> file to include this package's
  -info pages to the index.</para>
  +<para><screen><userinput>install-info /usr/share/info/libext2fs.info /usr/share/info/dir</userinput></screen></para>
   
   </sect2>
   
  
  
  
  1.21      +15 -24    LFS/BOOK/chapter06/ed-inst.xml
  
  Index: ed-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/ed-inst.xml,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- ed-inst.xml	17 Jan 2003 21:35:41 -0000	1.20
  +++ ed-inst.xml	19 Jan 2003 15:36:47 -0000	1.21
  @@ -9,16 +9,20 @@
   days.</para></note>
   
   <para>This package requires its patch to be applied before you can
  -install it.</para>
  +install it. This patch fixes a symlink vulnerability in
  +<userinput>ed</userinput>. The <userinput>ed</userinput> executable
  +creates files in <filename class="directory">/tmp</filename> with
  +predictable names. By using various symlink attacks, it is possible
  +to have ed write to files it should not, change the permissions of
  +files, etc.</para>
   
  -<para><screen><userinput>
  -patch -Np1 -i ../ed-&ed-patch-version;.patch
  -</userinput></screen></para>
  +<para>Apply the patch:</para>
  +
  +<para><screen><userinput>patch -Np1 -i ../ed-&ed-patch-version;.patch</userinput></screen></para>
   
   <para>Prepare Ed to be compiled:</para>
   
  -<para><screen><userinput>
  -./configure --prefix=/usr</userinput></screen></para>
  +<para><screen><userinput>./configure --prefix=/usr</userinput></screen></para>
   
   <para>Continue with compiling the package:</para>
   
  @@ -28,25 +32,12 @@
   
   <para><screen><userinput>make install</userinput></screen></para>
   
  -<para>Move the Ed binaries to the root partition.</para>
  -
  -<para><screen><userinput>mv /usr/bin/{ed,red} /bin
  -</userinput></screen></para>
  -
  -</sect2>
  -
  -<sect2>
  -<title>Command explanations</title>
  -
  -<para><userinput>patch -Np1 -i ../ed-&ed-version;.patch:</userinput> This
  -patch fixes a symlink vulnerability in ed. The ed executable creates files
  -in /tmp with predictable names. By using various symlink attacks, it is
  -possible to have ed write to files it should not, change the permissions
  -of files, etc.</para>
  +<para>We need to move the Ed binaries to the <filename
  +class="directory">/bin</filename> directory so they may be used in
  +the event that the <filename class="directory">/usr</filename>
  +partition is unavailable.</para>
   
  -<para><userinput>mv /usr/bin/{ed,red} /bin:</userinput>
  -The Ed binaries are moved to the /bin directory so they may be used in
  -the event that the /usr partition is unavailable.</para>
  +<para><screen><userinput>mv /usr/bin/{ed,red} /bin</userinput></screen></para>
   
   </sect2>
   
  
  
  
  1.18      +1 -3      LFS/BOOK/chapter06/file-inst.xml
  
  Index: file-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/file-inst.xml,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- file-inst.xml	17 Jan 2003 01:14:19 -0000	1.17
  +++ file-inst.xml	19 Jan 2003 15:36:47 -0000	1.18
  @@ -5,9 +5,7 @@
   
   <para>Prepare File to be compiled:</para>
   
  -<para><screen><userinput>
  -./configure --prefix=/usr --datadir=/usr/share/misc
  -</userinput></screen></para> 
  +<para><screen><userinput>./configure --prefix=/usr --datadir=/usr/share/misc</userinput></screen></para> 
   
   <para>Continue with compiling the package:</para>
   
  
  
  
  1.10      +1 -3      LFS/BOOK/chapter06/grep-inst.xml
  
  Index: grep-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/grep-inst.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- grep-inst.xml	17 Jan 2003 04:43:36 -0000	1.9
  +++ grep-inst.xml	19 Jan 2003 15:36:47 -0000	1.10
  @@ -5,9 +5,7 @@
   
   <para>Prepare Grep to be compiled:</para>
   
  -<para><screen><userinput>
  -./configure --prefix=/usr --bindir=/bin
  -</userinput></screen></para>
  +<para><screen><userinput>./configure --prefix=/usr --bindir=/bin</userinput></screen></para>
   
   <para>Continue with compiling the package:</para>
   
  
  
  
  1.17      +18 -26    LFS/BOOK/chapter06/gzip-inst.xml
  
  Index: gzip-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/gzip-inst.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- gzip-inst.xml	17 Jan 2003 05:09:20 -0000	1.16
  +++ gzip-inst.xml	19 Jan 2003 15:36:47 -0000	1.17
  @@ -3,46 +3,38 @@
   <sect2>
   <title>Installation of Gzip</title>
   
  +<para>A buffer overflow may occur if <userinput>gzip</userinput>
  +encounters a filename over 1020 characters in length. Apply the
  +patch to fix this problem:</para>
  +
  +<para><screen><userinput>patch -Np1 -i ../gzip-&gzip-patch-version;.patch</userinput></screen></para>
  +
   <para>Prepare Gzip to be compiled:</para>
   
  -<para><screen><userinput>
  -patch -Np1 -i ../gzip-&gzip-patch-version;.patch && 
  -./configure --prefix=/usr &&
  -cp gzexe.in{,.backup} &&
  -sed 's%"BINDIR"%/bin%' gzexe.in.backup > gzexe.in
  -</userinput></screen></para>
  +<para><screen><userinput>./configure --prefix=/usr</userinput></screen></para>
  +
  +<para>Change the default installation directory for Gzip so it will
  +be installed in the <filename class="directory">/bin</filename>
  +directory:</para>
  +
  +<para><screen><userinput>cp gzexe.in{,.backup} &&
  +sed 's%"BINDIR"%/bin%' gzexe.in.backup > gzexe.in</userinput></screen></para>
   
   <para>Continue with compiling the package:</para>
   
   <para><screen><userinput>make</userinput></screen></para>
   
  -<para>And finish off installing the package:</para>
  +<para>Install the package:</para>
   
   <para><screen><userinput>make install</userinput></screen></para>
   
  -<para>Move the Gzip binaries to the root partition:</para>
  +<para>Move the Gzip binaries to the <filename
  +class="directory">/bin</filename> directory:</para>
   
  -<para><screen><userinput>
  -mv /usr/bin/gzip /bin &&
  +<para><screen><userinput>mv /usr/bin/gzip /bin &&
   rm /usr/bin/{gunzip,zcat} &&
   ln -s gzip /bin/gunzip &&
   ln -s gzip /bin/zcat &&
   ln -s gunzip /bin/uncompress</userinput></screen></para>
  -
  -</sect2>
  -
  -<sect2>
  -<title>Command explanations</title>
  -
  -<para><userinput>patch -Np1 -i ../gzip-1.2.4b.patch:</userinput>
  -This patch fixes a buffer overflow that occurs when a filename is
  -longer than 1020 characters.</para>
  -
  -<para><userinput>
  -cp gzexe.in{,.backup} &&
  -sed 's%"BINDIR"%/bin%' gzexe.in.backup > gzexe.in</userinput>
  -Change the default installation directory for Gzip so it will be
  -installed on the root partition.</para>
  -
   
   </sect2>
  
  
  
  1.20      +2 -14     LFS/BOOK/chapter06/kbd-inst.xml
  
  Index: kbd-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/kbd-inst.xml,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- kbd-inst.xml	17 Jan 2003 03:51:15 -0000	1.19
  +++ kbd-inst.xml	19 Jan 2003 15:36:47 -0000	1.20
  @@ -5,16 +5,13 @@
   
   <para>Kbd doesn't install some of its utilities (setlogcons, setvesablank
   and getunimap) by default. The kbd patch enables the compilation of these
  -utilities.</para>
  -
  -<para>Apply the patch by running the following command:</para>
  +utilities. Apply the patch:</para>
   
   <para><screen><userinput>patch -Np1 -i ../kbd-&kbd-patch-version;.patch</userinput></screen></para>
   
   <para>Prepare Kbd to be compiled:</para>
   
  -<para><screen><userinput>
  -./configure</userinput></screen></para>
  +<para><screen><userinput>./configure</userinput></screen></para>
   
   <para>Continue with compiling the package:</para>
   
  @@ -23,15 +20,6 @@
   <para>And finish off installing the package:</para>
   
   <para><screen><userinput>make install</userinput></screen></para>
  -
  -</sect2>
  -
  -<sect2>
  -<title>Command explanations</title>
  -
  -<para><userinput>patch -Np1 -i ../kbd-&kbd-patch-version;.patch</userinput>:
  -This patch changes a Makefile so some utilities that are not installed by
  -default (setlogcons, setvesablank and getunimap) are installed.</para>
   
   </sect2>
   
  
  
  
  1.9       +1 -18     LFS/BOOK/chapter06/libtool-inst.xml
  
  Index: libtool-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/libtool-inst.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- libtool-inst.xml	17 Jan 2003 01:52:50 -0000	1.8
  +++ libtool-inst.xml	19 Jan 2003 15:36:47 -0000	1.9
  @@ -3,17 +3,9 @@
   <sect2>
   <title>Installation of Libtool</title>
   
  -<para>This package requires its patch to be applied before you can
  -  install it. Issue the following command to apply the patch:</para>
  -
  -<para><screen><userinput>
  -patch -Np1 -i ../libtool-&libtool-patch-version;.patch &&      
  -</userinput></screen></para>
  -
   <para>Prepare Libtool to be compiled:</para>
   
  -<para><screen><userinput>
  -./configure --prefix=/usr</userinput></screen></para>
  +<para><screen><userinput>./configure --prefix=/usr</userinput></screen></para>
   
   <para>Continue with compiling the package:</para>
   
  @@ -23,13 +15,4 @@
   
   <para><screen><userinput>make install</userinput></screen></para>
   
  -</sect2>
  -
  -<sect2>
  -<title>Command explanations</title>
  -
  -<para><userinput>patch -Np1 -i ../libtool-&libtool-patch-version;.patch</userinput>: 
  -This patch fixes an incompatibility between Autoconf 2.53 and Libtool 1.4.x.
  -Specifically, the deprecated m4 macro AC_PROVIDE_AC_LIBTOOL is replaced by
  -AC_PROVIDE_ELSEIF.</para>
   </sect2>
  
  
  
  1.21      +7 -7      LFS/BOOK/chapter06/lilo-inst.xml
  
  Index: lilo-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/lilo-inst.xml,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- lilo-inst.xml	17 Jan 2003 13:18:26 -0000	1.20
  +++ lilo-inst.xml	19 Jan 2003 15:36:47 -0000	1.21
  @@ -16,14 +16,14 @@
   <para><screen><userinput>make install</userinput></screen></para>
   
   <para>It appears that compilation of this package fails on certain machines
  -when the -g compiler flag is used. If you can't compile Lilo at
  -all, you should try to remove the -g value from the CFLAGS variable in the
  -<filename>Makefile</filename> file.</para>
  +when the <emphasis>-g</emphasis> compiler flag is used. If you can't compile
  +Lilo at all, you should try to remove the <emphasis>-g</emphasis> value from
  +the CFLAGS variable in the <filename>Makefile</filename> file.</para>
   
  -<para>At the end of the installation the make install process will print a
  -message stating that /sbin/lilo has to be executed to complete the
  -update. Don't do this, as it has no use: the /etc/lilo.conf isn't present
  -yet. We will complete the installation of lilo in Chapter 8.</para>
  +<para>At the end of the installation, a message will appear stating that
  +<filename>/sbin/lilo</filename> has to be executed. This is pointless because
  +the <filename>/etc/lilo.conf</filename> file isn't present yet. We will
  +complete the installation of lilo in Chapter 8.</para>
   
   <para>The standard LILO prompt, or menu, may be replaced by the
   LFS logo or any logo you like. Martin Imobersteg has written a
  
  
  
  1.8       +2 -2      LFS/BOOK/chapter06/make-inst.xml
  
  Index: make-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/make-inst.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- make-inst.xml	15 Jan 2003 19:49:29 -0000	1.7
  +++ make-inst.xml	19 Jan 2003 15:36:47 -0000	1.8
  @@ -15,11 +15,11 @@
   
   <para><screen><userinput>make install</userinput></screen></para>
   
  -<para>By default <filename>/usr/bin/make</filename> is installed setgid
  +<para>By default, <filename>/usr/bin/make</filename> is installed setgid
   kmem. This is needed on some systems so it can check the load average by
   using <filename>/dev/kmem</filename>. However, on Linux systems, setgid
   kmem is not needed, so we remove this from our <filename>make</filename>
  -binary. This also fixes problems with the <filename>make</filename>
  +binary. This also fixes problems with <filename>make</filename>
   ignoring certain variables like <emphasis>LD_LIBRARY_PATH</emphasis>.</para>
   
   <para><screen><userinput>chgrp root /usr/bin/make &&
  
  
  
  1.33      +28 -29    LFS/BOOK/chapter06/man-inst.xml
  
  Index: man-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/man-inst.xml,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- man-inst.xml	17 Jan 2003 13:18:26 -0000	1.32
  +++ man-inst.xml	19 Jan 2003 15:36:47 -0000	1.33
  @@ -3,17 +3,37 @@
   <sect2>
   <title>Installation of Man</title>
   
  -
  +<para>There are three patches for Man. The first patch comments out one of the
  +lines in the <filename>man.conf</filename> file (MANPATH /usr/man) to
  +prevent redundant results when using programs such as
  +<userinput>whatis</userinput>:</para>
  +
  +<para><screen><userinput>patch -Np1 -i ../man-&man-manpath-patch-version;-manpath.patch</userinput></screen></para>
  +
  +<para>The second patch adds the <emphasis>-R</emphasis> option to the
  +<emphasis>PAGER</emphasis> variable so that escape sequences are
  +handled properly:</para>
  +
  +<para><screen><userinput>patch -Np1 -i ../man-&man-pager-patch-version;-pager.patch</userinput></screen></para>
  +
  +<para>The last patch prevents problem when man pages not formatted
  +with more than 80 columns are used in conjunction with recent releases
  +of <userinput>groff</userinput>:</para>
  +
  +<para><screen><userinput>patch -Np1 -i ../man-&man-80cols-patch-version;-80cols.patch</userinput></screen></para>
  +
  +<para>The paths to some programs are written into man's files.
  +Unfortunately, the configure script picks the last location in PATH
  +rather than the first place a program is found. By appending
  +<emphasis>/usr/bin:/bin</emphasis> to PATH for the
  +<userinput>./configure</userinput> command, we ensure that man doesn't
  +use the programs in the <filename class="directory">/static</filename>
  +directory.</para>
   
   <para>Prepare Man to be compiled:</para>
   
  -<para><screen><userinput>
  -patch -Np1 -i ../man-&man-80cols-patch-version;-80cols.patch &&
  -patch -Np1 -i ../man-&man-manpath-patch-version;-manpath.patch &&
  -patch -Np1 -i ../man-&man-pager-patch-version;-pager.patch &&
  -PATH=$PATH:/usr/bin:/bin \
  -    ./configure -default -confdir=/etc
  -</userinput></screen></para>
  +<para><screen><userinput>PATH=$PATH:/usr/bin:/bin \
  +    ./configure -default -confdir=/etc</userinput></screen></para>
   
   <para>Continue with compiling the package:</para>
   
  @@ -30,27 +50,6 @@
   <para>You may want to take a look at the man hint 
   at <ulink url="&hints-root;man.txt"/>, which deals with formatting 
   and compression issues for man pages.</para>
  -
  -</sect2>
  -
  -<sect2>
  -<title>Command explanations</title>
  -
  -<para><userinput>patch...:</userinput>
  -These three patches comment out one of the lines in the
  -<filename>man.conf</filename> file (MANPATH /usr/man) because it will create
  -redundant results when using programs like <userinput>whatis</userinput>.
  -It also adds the <emphasis>-R</emphasis> option to the
  -<emphasis>PAGER</emphasis> variable so man pages are displayed properly.
  -Lastly, the patch fixes the problem where man pages are not formatted with
  -more than 80 columns when used with the recent groff versions.</para>
  -
  -<para><userinput>PATH=$PATH:/usr/bin:/bin ./configure -default</userinput>:
  -The paths to some programs get written into man's files. Unfortunately, the
  -configure script picks the last location in PATH rather than the first
  -where a program is found. By appending /usr/bin:/bin to PATH for the
  -./configure command, we make sure that man doesn't use the /static versions
  -of our programs.</para>
   
   </sect2>
   
  
  
  
  1.10      +7 -14     LFS/BOOK/chapter06/texinfo-inst.xml
  
  Index: texinfo-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/texinfo-inst.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- texinfo-inst.xml	16 Jan 2003 13:27:23 -0000	1.9
  +++ texinfo-inst.xml	19 Jan 2003 15:36:47 -0000	1.10
  @@ -5,27 +5,20 @@
   
   <para>Prepare Texinfo to be compiled:</para>
   
  -<para><screen><userinput>
  -./configure --prefix=/usr</userinput></screen></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>And finish off installing the package:</para>
  +<para>Install the package:</para>
   
   <para><screen><userinput>make install</userinput></screen></para>
  -<para><screen><userinput>
  -make TEXMF=/usr/share/texmf install-tex </userinput></screen></para>
  -</sect2>
  -
  -<sect2>
  -<title>Command explanations</title>
  -
  -<para><userinput>make TEXMF=/usr/share/texmf install-tex:</userinput>
  -This installs the texinfo components that belong in a TeX
  -installation. Although TeX isn't installed on LFS, it's installed here
  -to complete the texinfo installation. </para>
  +
  +<para>Install the texinfo components which belong in a TeX
  +installation:</para>
  +
  +<para><screen><userinput>make TEXMF=/usr/share/texmf install-tex</userinput></screen></para>
   
   </sect2>
   
  
  
  
-- 
Unsubscribe: send email to listar at linuxfromscratch.org
and put 'unsubscribe lfs-book' in the subject header of the message



More information about the lfs-book mailing list