Pārlūkot izejas kodu

Applied Zack's various-fixes patch.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2608 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Gerard Beekmans 22 gadi atpakaļ
vecāks
revīzija
4a7a683b9a
43 mainītis faili ar 125 papildinājumiem un 77 dzēšanām
  1. 18 8
      chapter01/changelog.xml
  2. 4 4
      chapter03/mounting.xml
  3. 2 2
      chapter05/gettext-inst.xml
  4. 1 1
      chapter05/glibc-inst.xml
  5. 2 2
      chapter05/kernelheaders-inst.xml
  6. 5 5
      chapter05/perl-inst.xml
  7. 1 1
      chapter06/adjustingtoolchain.xml
  8. 2 0
      chapter06/autoconf-inst.xml
  9. 2 0
      chapter06/automake-inst.xml
  10. 2 0
      chapter06/bash-inst.xml
  11. 2 3
      chapter06/binutils-inst.xml
  12. 2 0
      chapter06/bison-inst.xml
  13. 7 7
      chapter06/bzip2-inst.xml
  14. 6 4
      chapter06/coreutils-inst.xml
  15. 9 9
      chapter06/creatingdirs.xml
  16. 2 0
      chapter06/diffutils-inst.xml
  17. 3 1
      chapter06/e2fsprogs-inst.xml
  18. 2 0
      chapter06/ed-inst.xml
  19. 2 0
      chapter06/findutils-inst.xml
  20. 2 0
      chapter06/flex-inst.xml
  21. 2 0
      chapter06/gawk-inst.xml
  22. 1 3
      chapter06/gcc-inst.xml
  23. 2 0
      chapter06/gettext-inst.xml
  24. 2 3
      chapter06/glibc-inst.xml
  25. 2 0
      chapter06/grep-inst.xml
  26. 2 2
      chapter06/groff-inst.xml
  27. 5 5
      chapter06/gzip-inst.xml
  28. 1 2
      chapter06/inetutils-inst.xml
  29. 1 1
      chapter06/kernel-inst.xml
  30. 2 0
      chapter06/libtool-inst.xml
  31. 2 0
      chapter06/m4-inst.xml
  32. 2 0
      chapter06/make-inst.xml
  33. 2 0
      chapter06/patch-inst.xml
  34. 2 0
      chapter06/perl-inst.xml
  35. 2 0
      chapter06/sed-inst.xml
  36. 2 2
      chapter06/shadowpwd-inst.xml
  37. 1 1
      chapter06/sysvinit-inst.xml
  38. 2 0
      chapter06/tar-inst.xml
  39. 2 0
      chapter06/texinfo-inst.xml
  40. 2 2
      chapter06/utillinux-inst.xml
  41. 5 4
      chapter06/zlib-inst.xml
  42. 1 1
      chapter08/lilo.xml
  43. 4 4
      chapter09/reboot.xml

+ 18 - 8
chapter01/changelog.xml

@@ -65,15 +65,23 @@
 <itemizedlist>
 <listitem><para>fileutils-4.1</para></listitem>
 <listitem><para>fileutils-4.1.patch</para></listitem>
+<listitem><para>findutils-4.1-segfault.patch</para></listitem>
+<listitem><para>findutils-4.1.patch</para></listitem>
+<listitem><para>gzip-1.2.4b.patch</para></listitem>
 <listitem><para>netkit-base-0.17</para></listitem>
 <listitem><para>sh-utils-2.0</para></listitem>
 <listitem><para>sh-utils-2.0.patch</para></listitem>
 <listitem><para>sh-utils-2.0-hostname.patch</para></listitem>
+<listitem><para>tar-1.13.patch</para></listitem>
 <listitem><para>textutils-2.1</para></listitem>
 <listitem><para>vim-6.1.patch</para></listitem>
 </itemizedlist>
 </para></listitem>
 
+<listitem><para>May 12th, 2003 [winkie]: Removed all occurrences &amp;&amp;.
+Updated bug syntax. Added "make check/test" where necessary in Chapter
+6.</para></listitem>
+
 <listitem><para>May 12th, 2003 [winkie]: Applied "Changing ownership"
 patch to polish the text. Closes bug #511.</para></listitem>
 
@@ -150,19 +158,21 @@ addition.</para></listitem>
 --without-bash-malloc configure option.</para></listitem>
 
 <listitem><para>May 11th, 2003 [gerard]: Updated to
-gcc-3.2.3-specs-4.patch</para></listitem>
+gcc-3.2.3-specs-4.patch.</para></listitem>
 
-<listitem><para>May 11th, 2003 (Bug #359 &amp; #515) [winkie]: Chapter
-06 - Setting up Basic Networking: Added section. Create a basic /etc/hosts
-files, and create /etc/services and /etc/protocols from IANA.</para></listitem>
+<listitem><para>May 11th, 2003 [winkie]: Chapter 06 - Setting up Basic
+Networking: Added section. Create a basic /etc/hosts files, and create
+/etc/services and /etc/protocols from IANA. Fixes bugs #359 &amp;
+#515.</para></listitem>
 
 <listitem><para>May 11th, 2003 [winkie]: Upgrading to lfs-utils-0.2.2.
 This adds two files needed for proper networking configuration.</para></listitem>
 
-<listitem><para>May 11th, 2003 (Bug #490) [winkie]: Removed Netkit-base
-0.17. Added Inetutils 1.4.2.</para></listitem>
+<listitem><para>May 11th, 2003 [winkie]: Removed Netkit-base 0.17. Added
+Inetutils 1.4.2. Fixes bug #490.</para></listitem>
 
-<listitem><para>May 11th, 2003 (Bug #493) [winkie]: Added lfs-utils-0.2.1.</para></listitem>
+<listitem><para>May 11th, 2003 [winkie]: Added lfs-utils-0.2.1. Fixes bug
+#493.</para></listitem>
 
 <listitem><para>May 11th, 2003 [winkie]: Chapter 06 - Installing Ncurses:
 Fix up the symlinks so that they follow suit of other library symlinks.
@@ -198,7 +208,7 @@ After installation, remove /usr/include/libiberty.h. It is not used
 outside of the GCC build tree.</para></listitem>
 
 <listitem><para>May 11th, 2003 [winkie]: Upgraded to Bash 2.05b and
-added its patch</para></listitem>
+added its patch.</para></listitem>
 
 <listitem><para>May 11th, 2003 [winkie]: Chapter 06 - Installing Zlib:
 Apply a patch to fix the buffer overflow in gzprintf().</para></listitem>

+ 4 - 4
chapter03/mounting.xml

@@ -15,7 +15,7 @@ by running:</para>
 
 <para>Now create the mount point and mount the LFS file system by running:</para>
 
-<para><screen><userinput>mkdir -p $LFS &amp;&amp;
+<para><screen><userinput>mkdir -p $LFS
 mount /dev/xxx $LFS</userinput></screen></para>
 
 <para>Replace <filename>xxx</filename> with the designation of the LFS
@@ -25,9 +25,9 @@ partition.</para>
 <filename>/</filename> and another for <filename>/usr</filename>), mount
 them like this:</para>
 
-<para><screen><userinput>mkdir -p $LFS &amp;&amp;
-mount /dev/xxx $LFS &amp;&amp;
-mkdir $LFS/usr &amp;&amp;
+<para><screen><userinput>mkdir -p $LFS
+mount /dev/xxx $LFS
+mkdir $LFS/usr
 mount /dev/yyy $LFS/usr</userinput></screen></para>
 
 <para>Of course, replace <filename>xxx</filename> and <filename>yyy</filename>

+ 2 - 2
chapter05/gettext-inst.xml

@@ -3,8 +3,8 @@
 <sect2>
 <title>Installation of Gettext</title>
 
-<para><screen><userinput>./configure --prefix=/stage1 &amp;&amp;
-make &amp;&amp;
+<para><screen><userinput>./configure --prefix=/stage1
+make
 make check
 make install</userinput></screen></para>
 

+ 1 - 1
chapter05/glibc-inst.xml

@@ -20,7 +20,7 @@ is putting your system at a very high risk.</para>
 <para>The documentation that comes with Glibc recommends to build the package
 not in the source directory but in a separate, dedicated directory:</para>
 
-<para><screen><userinput>mkdir ../glibc-build &amp;&amp;
+<para><screen><userinput>mkdir ../glibc-build
 cd ../glibc-build</userinput></screen></para>
 
 <para>Next, prepare Glibc to be compiled:</para>

+ 2 - 2
chapter05/kernelheaders-inst.xml

@@ -43,8 +43,8 @@ symlink:</para>
 
 <para>Install the platform specific-header files:</para>
 
-<para><screen><userinput>mkdir /stage1/include/asm &amp;&amp;
-cp include/asm/* /stage1/include/asm &amp;&amp;
+<para><screen><userinput>mkdir /stage1/include/asm
+cp include/asm/* /stage1/include/asm
 cp -R include/asm-generic /stage1/include</userinput></screen></para>
 
 <para>Install the cross-platform kernel header files:</para>

+ 5 - 5
chapter05/perl-inst.xml

@@ -5,12 +5,12 @@
 <para><screen><userinput>patch -Np1 -i ../perl-&perl-version;-libc.patch
 chmod u+w hints/linux.sh
 echo 'static_ext="IO re Fcntl"' >> hints/linux.sh
-./configure.gnu --prefix=/stage1 &amp;&amp;
+./configure.gnu --prefix=/stage1
 make perl
-make utilities &amp;&amp;
-cp perl /stage1/bin/perl &amp;&amp;
-cp pod/pod2man /stage1/bin &amp;&amp;
-mkdir -p /stage1/lib/perl5/5.8.0 &amp;&amp;
+make utilities
+cp perl /stage1/bin/perl
+cp pod/pod2man /stage1/bin
+mkdir -p /stage1/lib/perl5/5.8.0
 cp -R lib/* /stage1/lib/perl5/5.8.0</userinput></screen></para>
 
 </sect2>

+ 1 - 1
chapter06/adjustingtoolchain.xml

@@ -5,7 +5,7 @@
 <para><screen><userinput>cd binutils-build
 make -C ld INSTALL=/stage1/bin/install install-data-local
 
-SPECFILE=/stage1/lib/gcc-lib/*/*/specs &amp;&amp;
+SPECFILE=/stage1/lib/gcc-lib/*/*/specs
 sed -e 's@/stage1/lib/ld.so.1@/lib/ld.so.1@g' \
 &nbsp;&nbsp;&nbsp;&nbsp;-e 's@/stage1/lib/ld-linux.so.2@/lib/ld-linux.so.2@g' $SPECFILE > XX
 mv XX $SPECFILE

+ 2 - 0
chapter06/autoconf-inst.xml

@@ -10,6 +10,8 @@
 
 <para><screen><userinput>make</userinput></screen></para>
 
+<para><screen><userinput>make check</userinput></screen></para>
+
 <para>And finish off installing the package:</para>
 
 <para><screen><userinput>make install</userinput></screen></para>

+ 2 - 0
chapter06/automake-inst.xml

@@ -11,6 +11,8 @@
 
 <para><screen><userinput>make</userinput></screen></para>
 
+<para><screen><userinput>make check</userinput></screen></para>
+
 <para>And finish off installing the package:</para>
 
 <para><screen><userinput>make install</userinput></screen></para>

+ 2 - 0
chapter06/bash-inst.xml

@@ -17,6 +17,8 @@ patch:</para>
 
 <para><screen><userinput>make</userinput></screen></para>
 
+<para><screen><userinput>make tests</userinput></screen></para>
+
 <para>And finish off installing the package:</para>
 
 <para><screen><userinput>make install</userinput></screen></para>

+ 2 - 3
chapter06/binutils-inst.xml

@@ -11,14 +11,13 @@ or modifying them when building binutils.</para>
 <para>It is recommended by the Binutils installation documentation to build
 Binutils outside of the source directory:</para>
 
-<para><screen><userinput>mkdir ../binutils-build &amp;&amp;
+<para><screen><userinput>mkdir ../binutils-build
 cd ../binutils-build</userinput></screen></para>
 
 <para>Next, prepare Binutils to be compiled:</para>
 
 <para><screen><userinput>../binutils-&binutils-version;/configure \
-&nbsp;&nbsp;&nbsp;&nbsp;--prefix=/usr --mandir=/usr/share/man \
-&nbsp;&nbsp;&nbsp;&nbsp;--infodir=/usr/share/info --enable-shared</userinput></screen></para>
+&nbsp;&nbsp;&nbsp;&nbsp;--prefix=/usr --enable-shared</userinput></screen></para>
 
 <para>Continue with compiling the package:</para>
 

+ 2 - 0
chapter06/bison-inst.xml

@@ -11,6 +11,8 @@
 
 <para><screen><userinput>make</userinput></screen></para>
 
+<para><screen><userinput>make check</userinput></screen></para>
+
 <para>Finish installing the package:</para>
 
 <para><screen><userinput>make install</userinput></screen></para>

+ 7 - 7
chapter06/bzip2-inst.xml

@@ -5,7 +5,7 @@
 
 <para>Begin compiling the package:</para>
 
-<para><screen><userinput>make -f Makefile-libbz2_so &amp;&amp;
+<para><screen><userinput>make -f Makefile-libbz2_so
 make clean</userinput></screen></para>
 
 <para>The <emphasis>-f</emphasis> flag will cause bzip2 to be built
@@ -26,12 +26,12 @@ against it.</para>
 class="directory">/bin</filename> directory, make some
 necessary symbolic links and clean up.</para>
 
-<para><screen><userinput>cp bzip2-shared /bin/bzip2 &amp;&amp;
-cp -a libbz2.so* /lib &amp;&amp;
-ln -s ../../lib/libbz2.so.1.0 /usr/lib/libbz2.so &amp;&amp;
-rm /usr/bin/{bunzip2,bzcat,bzip2} &amp;&amp;
-mv /usr/bin/{bzip2recover,bzless,bzmore} /bin &amp;&amp;
-ln -s bzip2 /bin/bunzip2 &amp;&amp;
+<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>

+ 6 - 4
chapter06/coreutils-inst.xml

@@ -23,16 +23,18 @@ Prevent the installation of hostname with this patch:</para>
 
 <para><screen><userinput>make</userinput></screen></para>
 
+<para><screen><userinput>make check-root</userinput></screen></para>
+
 <para>Install the package:</para>
 
 <para><screen><userinput>make install</userinput></screen></para>
 
 <para>Move files to their proper locations:</para>
 
-<para><screen><userinput>mv /usr/bin/{basename,cat,chgrp,chmod,chown,cp,dd,df} /bin &amp;&amp;
-mv /usr/bin/{dir,dircolors,du,date,echo,false,head} /bin &amp;&amp;
-mv /usr/bin/{install,ln,ls,mkdir,mkfifo,mknod,mv,pwd} /bin &amp;&amp;
-mv /usr/bin/{rm,rmdir,shred,sync,sleep,stty,su,test} /bin &amp;&amp;
+<para><screen><userinput>mv /usr/bin/{basename,cat,chgrp,chmod,chown,cp,dd,df} /bin
+mv /usr/bin/{dir,dircolors,du,date,echo,false,head} /bin
+mv /usr/bin/{install,ln,ls,mkdir,mkfifo,mknod,mv,pwd} /bin
+mv /usr/bin/{rm,rmdir,shred,sync,sleep,stty,su,test} /bin
 mv /usr/bin/{touch,true,uname,vdir} /bin
 mv /usr/bin/chroot /usr/sbin</userinput></screen></para>
 

+ 9 - 9
chapter06/creatingdirs.xml

@@ -6,8 +6,8 @@
 a directory tree. Issuing the following commands will create a more or less
 standard tree:</para>
  
-<para><screen><userinput>mkdir -p /{bin,boot,dev/pts,etc/opt,home,lib,mnt,proc} &amp;&amp;
-mkdir -p /{root,sbin,tmp,usr/local,var,opt} &amp;&amp;
+<para><screen><userinput>mkdir -p /{bin,boot,dev/pts,etc/opt,home,lib,mnt,proc} 
+mkdir -p /{root,sbin,tmp,usr/local,var,opt}
 for dirname in /usr /usr/local
 &nbsp;&nbsp;&nbsp;&nbsp;do
 &nbsp;&nbsp;&nbsp;&nbsp;mkdir $dirname/{bin,etc,include,lib,sbin,share,src}
@@ -15,19 +15,19 @@ for dirname in /usr /usr/local
 &nbsp;&nbsp;&nbsp;&nbsp;mkdir $dirname/share/{dict,doc,info,locale,man}
 &nbsp;&nbsp;&nbsp;&nbsp;mkdir $dirname/share/{nls,misc,terminfo,zoneinfo}
 &nbsp;&nbsp;&nbsp;&nbsp;mkdir $dirname/share/man/man{1,2,3,4,5,6,7,8}
-done &amp;&amp;
-mkdir /usr/lib/locale &amp;&amp;
-mkdir /var/{lock,log,mail,run,spool} &amp;&amp;
-mkdir -p /var/{tmp,opt,cache,lib/misc,local} &amp;&amp;
-mkdir /opt/{bin,doc,include,info} &amp;&amp;
-mkdir -p /opt/{lib,man/man{1,2,3,4,5,6,7,8}} &amp;&amp;
+done
+mkdir /usr/lib/locale
+mkdir /var/{lock,log,mail,run,spool}
+mkdir -p /var/{tmp,opt,cache,lib/misc,local}
+mkdir /opt/{bin,doc,include,info}
+mkdir -p /opt/{lib,man/man{1,2,3,4,5,6,7,8}}
 ln -s ../var/tmp /usr</userinput></screen></para>
 
 <para>Directories are, by default, created with permission mode 755, but this
 isn't desirable for all directories. We will make two changes: one to the home
 directory of root, and another to the directories for temporary files.</para>
 
-<para><screen><userinput>chmod 0750 /root &amp;&amp;
+<para><screen><userinput>chmod 0750 /root
 chmod 1777 /tmp /var/tmp</userinput></screen></para>
 
 <para>The first mode change ensures that not just anybody can enter the

+ 2 - 0
chapter06/diffutils-inst.xml

@@ -11,6 +11,8 @@
 
 <para><screen><userinput>make</userinput></screen></para>
 
+<para><screen><userinput>make check</userinput></screen></para>
+
 <para>And finish off installing the package:</para>
 
 <para><screen><userinput>make install</userinput></screen></para>

+ 3 - 1
chapter06/e2fsprogs-inst.xml

@@ -6,7 +6,7 @@
 <para>It is recommended to build E2fsprogs outside of the
 source tree:</para>
 
-<para><screen><userinput>mkdir ../e2fsprogs-build &amp;&amp;
+<para><screen><userinput>mkdir ../e2fsprogs-build
 cd ../e2fsprogs-build</userinput></screen></para>
 
 <para>Prepare E2fsprogs to be compiled:</para>
@@ -38,6 +38,8 @@ of.</para></listitem>
 
 <para><screen><userinput>make</userinput></screen></para>
 
+<para><screen><userinput>make check</userinput></screen></para>
+
 <para>Begin installing the package:</para>
 
 <para><screen><userinput>make install</userinput></screen></para>

+ 2 - 0
chapter06/ed-inst.xml

@@ -27,6 +27,8 @@ temporary files.</para>
 
 <para><screen><userinput>make</userinput></screen></para>
 
+<para><screen><userinput>make check</userinput></screen></para>
+
 <para>And finish off installing the package:</para>
 
 <para><screen><userinput>make install</userinput></screen></para>

+ 2 - 0
chapter06/findutils-inst.xml

@@ -16,6 +16,8 @@ option to <userinput>configure</userinput>.</para>
 
 <para><screen><userinput>make</userinput></screen></para>
 
+<para><screen><userinput>make check</userinput></screen></para>
+
 <para>Finish installing the package:</para>
 
 <para><screen><userinput>make install</userinput></screen></para>

+ 2 - 0
chapter06/flex-inst.xml

@@ -11,6 +11,8 @@
 
 <para><screen><userinput>make</userinput></screen></para>
 
+<para><screen><userinput>make bigcheck</userinput></screen></para>
+
 <para>Install the package:</para>
 
 <para><screen><userinput>make install</userinput></screen></para>

+ 2 - 0
chapter06/gawk-inst.xml

@@ -41,6 +41,8 @@ with its contents on a make uninstall.</para></listitem>
 
 <para><screen><userinput>make</userinput></screen></para>
 
+<para><screen><userinput>make check</userinput></screen></para>
+
 <para>Finish installing the package:</para>
 
 <para><screen><userinput>make install</userinput></screen></para>

+ 1 - 3
chapter06/gcc-inst.xml

@@ -21,7 +21,7 @@ patch -Np1 -i ../gcc-&gcc-version;-mmap_test.patch</userinput></screen></para>
 in a dedicated directory outside of the source tree. Create the build
 directory:</para>
 
-<para><screen><userinput>mkdir ../gcc-build &amp;&amp;
+<para><screen><userinput>mkdir ../gcc-build
 cd ../gcc-build</userinput></screen></para>
 
 <para>Prepare GCC to be compiled:</para>
@@ -29,8 +29,6 @@ cd ../gcc-build</userinput></screen></para>
 <para><screen><userinput>../gcc-&gcc-version;/configure --prefix=/usr \
 &nbsp;&nbsp;&nbsp;&nbsp;--enable-shared --enable-threads=posix \
 &nbsp;&nbsp;&nbsp;&nbsp;--enable-__cxa_atexit --enable-clocale=gnu \
-&nbsp;&nbsp;&nbsp;&nbsp;--mandir=/usr/share/man \
-&nbsp;&nbsp;&nbsp;&nbsp;--infodir=/usr/share/info \
 &nbsp;&nbsp;&nbsp;&nbsp;--enable-languages=c,c++</userinput></screen></para>
 
 <para>The meanings of the configure options are:</para>

+ 2 - 0
chapter06/gettext-inst.xml

@@ -11,6 +11,8 @@
 
 <para><screen><userinput>make</userinput></screen></para>
 
+<para><screen><userinput>make check</userinput></screen></para>
+
 <para>Finish installing the package:</para>
 
 <para><screen><userinput>make install</userinput></screen></para>

+ 2 - 3
chapter06/glibc-inst.xml

@@ -6,7 +6,7 @@
 <para>The documentation that comes with Glibc recommends to build the package
 not in the source directory but in a separate, dedicated directory:</para>
 
-<para><screen><userinput>mkdir ../glibc-build &amp;&amp;
+<para><screen><userinput>mkdir ../glibc-build
 cd ../glibc-build</userinput></screen></para>
 
 <para>Next, prepare Glibc to be compiled:</para>
@@ -14,8 +14,7 @@ cd ../glibc-build</userinput></screen></para>
 <para><screen><userinput>../glibc-&glibc-version;/configure --prefix=/usr \
 &nbsp;&nbsp;&nbsp;&nbsp;--disable-profile --enable-add-ons \
 &nbsp;&nbsp;&nbsp;&nbsp;--libexecdir=/usr/bin \
-&nbsp;&nbsp;&nbsp;&nbsp;--with-headers=/usr/include \
-&nbsp;&nbsp;&nbsp;&nbsp;--mandir=/usr/share/man --infodir=/usr/share/info</userinput></screen></para>
+&nbsp;&nbsp;&nbsp;&nbsp;--with-headers=/usr/include</userinput></screen></para>
 
 <para>The meaning of the configure options are:</para>
 

+ 2 - 0
chapter06/grep-inst.xml

@@ -12,6 +12,8 @@
 
 <para><screen><userinput>make</userinput></screen></para>
 
+<para><screen><userinput>make check</userinput></screen></para>
+
 <para>And finish off installing the package:</para>
 
 <para><screen><userinput>make install</userinput></screen></para>

+ 2 - 2
chapter06/groff-inst.xml

@@ -18,8 +18,8 @@
 <para>Some groff/man document programs, such as <userinput>xman</userinput>,
 will not work work properly without the following symlinks:</para>
 
-<para><screen><userinput>ln -s soelim /usr/bin/zsoelim &amp;&amp;
-ln -s eqn /usr/bin/geqn &amp;&amp;
+<para><screen><userinput>ln -s soelim /usr/bin/zsoelim
+ln -s eqn /usr/bin/geqn
 ln -s tbl /usr/bin/gtbl</userinput></screen></para>
 
 </sect2>

+ 5 - 5
chapter06/gzip-inst.xml

@@ -11,7 +11,7 @@
 be installed in the <filename class="directory">/bin</filename>
 directory:</para>
 
-<para><screen><userinput>cp gzexe.in{,.backup} &amp;&amp;
+<para><screen><userinput>cp gzexe.in{,.backup}
 sed 's%"BINDIR"%/bin%' gzexe.in.backup &gt; gzexe.in</userinput></screen></para>
 
 <para>Continue with compiling the package:</para>
@@ -25,10 +25,10 @@ sed 's%"BINDIR"%/bin%' gzexe.in.backup &gt; gzexe.in</userinput></screen></para>
 <para>Move the Gzip binaries to the <filename
 class="directory">/bin</filename> directory:</para>
 
-<para><screen><userinput>mv /usr/bin/gzip /bin &amp;&amp;
-rm /usr/bin/{gunzip,zcat} &amp;&amp;
-ln -s gzip /bin/gunzip &amp;&amp;
-ln -s gzip /bin/zcat &amp;&amp;
+<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>

+ 1 - 2
chapter06/inetutils-inst.xml

@@ -6,8 +6,7 @@
 <para>Prepare Inetutils to be compiled:</para>
 
 <para><screen><userinput>./configure --prefix=/usr --disable-syslogd \
-&nbsp;&nbsp;&nbsp;&nbsp;--libexecdir=/usr/sbin --infodir=/usr/share/info \
-&nbsp;&nbsp;&nbsp;&nbsp;--mandir=/usr/share/man --disable-logger</userinput></screen></para>
+&nbsp;&nbsp;&nbsp;&nbsp;--libexecdir=/usr/sbin --disable-logger</userinput></screen></para>
 
 <para>The meanings of the configure options are:</para>
 

+ 1 - 1
chapter06/kernel-inst.xml

@@ -43,7 +43,7 @@ symlink:</para>
 
 <para>Install the platform specific-header files:</para>
 
-<para><screen><userinput>cp -HR include/asm /usr/include &amp;&amp;
+<para><screen><userinput>cp -HR include/asm /usr/include
 cp -R include/asm-generic /usr/include</userinput></screen></para>
 
 <para>Install the cross-platform kernel header files:</para>

+ 2 - 0
chapter06/libtool-inst.xml

@@ -11,6 +11,8 @@
 
 <para><screen><userinput>make</userinput></screen></para>
 
+<para><screen><userinput>make check</userinput></screen></para>
+
 <para>And finish off installing the package:</para>
 
 <para><screen><userinput>make install</userinput></screen></para>

+ 2 - 0
chapter06/m4-inst.xml

@@ -11,6 +11,8 @@
 
 <para><screen><userinput>make</userinput></screen></para>
 
+<para><screen><userinput>make check</userinput></screen></para>
+
 <para>Finish installing the package:</para>
 
 <para><screen><userinput>make install</userinput></screen></para>

+ 2 - 0
chapter06/make-inst.xml

@@ -11,6 +11,8 @@
 
 <para><screen><userinput>make</userinput></screen></para>
 
+<para><screen><userinput>make check</userinput></screen></para>
+
 <para>And finish off installing the package:</para>
 
 <para><screen><userinput>make install</userinput></screen></para>

+ 2 - 0
chapter06/patch-inst.xml

@@ -11,6 +11,8 @@
 
 <para><screen><userinput>make</userinput></screen></para>
 
+<para><screen><userinput>make check</userinput></screen></para>
+
 <para>Finish installing the package:</para>
 
 <para><screen><userinput>make install</userinput></screen></para>

+ 2 - 0
chapter06/perl-inst.xml

@@ -18,6 +18,8 @@ above.</para>
 
 <para><screen><userinput>make</userinput></screen></para>
 
+<para><screen><userinput>make test</userinput></screen></para>
+
 <para>And finish off installing the package:</para>
 
 <para><screen><userinput>make install</userinput></screen></para>

+ 2 - 0
chapter06/sed-inst.xml

@@ -11,6 +11,8 @@
 
 <para><screen><userinput>make</userinput></screen></para>
 
+<para><screen><userinput>make check</userinput></screen></para>
+
 <para>Finish installing the package:</para>
 
 <para><screen><userinput>make install</userinput></screen></para>

+ 2 - 2
chapter06/shadowpwd-inst.xml

@@ -18,7 +18,7 @@ shutdown and a record of bas login attempts.</para>
 <para>Create these files with their proper permissions by running the
 following commands:</para>
 
-<para><screen><userinput>touch /var/run/utmp /var/log/{btmp,lastlog,wtmp} &amp;&amp;
+<para><screen><userinput>touch /var/run/utmp /var/log/{btmp,lastlog,wtmp}
 chmod 644 /var/run/utmp /var/log/{btmp,lastlog,wtmp}</userinput></screen></para>
 
 <para>Shadow hard-codes the path to the passwd binary within itself, but
@@ -84,7 +84,7 @@ find them in them in the
 <filename class="directory">/usr/lib</filename> directory. To account
 for this, create the following symlinks:</para>
 
-<para><screen><userinput>ln -sf ../../lib/libshadow.so.0 /usr/lib/libshadow.so &amp;&amp;
+<para><screen><userinput>ln -sf ../../lib/libshadow.so.0 /usr/lib/libshadow.so
 ln -sf ../../lib/libmisc.so.0 /usr/lib/libmisc.so</userinput></screen></para>
 
 <para>Sh-utils and Shadow Password Suite each install a unique

+ 1 - 1
chapter06/sysvinit-inst.xml

@@ -13,7 +13,7 @@ signal".</para>
 
 <para>Edit the halt message:</para>
 
-<para><screen><userinput>cp src/init.c{,.backup} &amp;&amp;
+<para><screen><userinput>cp src/init.c{,.backup}
 sed 's/Sending processes/Sending processes started by init/g' \
 &nbsp;&nbsp;&nbsp;&nbsp;src/init.c.backup &gt; src/init.c</userinput></screen></para>
 

+ 2 - 0
chapter06/tar-inst.xml

@@ -12,6 +12,8 @@
 
 <para><screen><userinput>make</userinput></screen></para>
 
+<para><screen><userinput>make check</userinput></screen></para>
+
 <para>Finish installing the package:</para>
 
 <para><screen><userinput>make install</userinput></screen></para>

+ 2 - 0
chapter06/texinfo-inst.xml

@@ -11,6 +11,8 @@
 
 <para><screen><userinput>make</userinput></screen></para>
 
+<para><screen><userinput>make check</userinput></screen></para>
+
 <para>Install the package:</para>
 
 <para><screen><userinput>make install</userinput></screen></para>

+ 2 - 2
chapter06/utillinux-inst.xml

@@ -7,9 +7,9 @@
 usual /etc, as the location of the adjtime file. To make hwclock
 FHS-compliant, run the following:</para>
 
-<para><screen><userinput>cp hwclock/hwclock.c{,.backup} &amp;&amp;
+<para><screen><userinput>cp hwclock/hwclock.c{,.backup}
 sed 's%etc/adjtime%var/lib/hwclock/adjtime%' \
-&nbsp;&nbsp;&nbsp;&nbsp;hwclock/hwclock.c.backup &gt; hwclock/hwclock.c &amp;&amp;
+&nbsp;&nbsp;&nbsp;&nbsp;hwclock/hwclock.c.backup &gt; hwclock/hwclock.c
 mkdir -p /var/lib/hwclock</userinput></screen></para>
 
 </sect2>

+ 5 - 4
chapter06/zlib-inst.xml

@@ -21,10 +21,11 @@ quality in the dynamic zlib library.</para>
 
 <para>Install the libraries:</para>
 
-<para><screen><userinput>make install &amp;&amp;
-make clean &amp;&amp;
-./configure --prefix=/usr &amp;&amp;
-make &amp;&amp;
+<para><screen><userinput>make install
+make clean
+./configure --prefix=/usr
+make
+make test
 make install</userinput></screen></para>
 
 <para>The shared zlib library should be installed in the

+ 1 - 1
chapter08/lilo.xml

@@ -41,7 +41,7 @@ the line <userinput>read-only</userinput> should be changed to
 <para>The last step is synchronizing the host system's lilo
 configuration files with the LFS system's:</para>
 
-<para><screen><userinput>cp /etc/lilo.conf $LFS/etc &amp;&amp;
+<para><screen><userinput>cp /etc/lilo.conf $LFS/etc
 cp $(grep "image.*=" /etc/lilo.conf | cut -f 2 -d "=") $LFS/boot</userinput></screen></para>
 
 </sect1>

+ 4 - 4
chapter09/reboot.xml

@@ -6,15 +6,15 @@
 the computer. Before we reboot, let's unmount $LFS/proc and the LFS
 partition itself by running:</para>
 
-<para><screen><userinput>umount $LFS/proc &amp;&amp;
+<para><screen><userinput>umount $LFS/proc
 umount $LFS</userinput></screen></para>
 
 <para>If you decided to create multiple partitions, you need to umount the
 other partitions before you umount $LFS, like this:</para>
 
-<para><screen><userinput>umount $LFS/proc &amp;&amp;
-umount $LFS/usr &amp;&amp;
-umount $LFS/home &amp;&amp;
+<para><screen><userinput>umount $LFS/proc
+umount $LFS/usr
+umount $LFS/home
 umount $LFS</userinput></screen></para>
 
 <para>And you can reboot your system by running something like:</para>