[Bug 164] XML Tidy up

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@1329 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

chapter01/changelog.xml

@@ -31,6 +31,10 @@
 
 </para></listitem>
 
+<listitem><para>October 27th, 2001 [markh]: General: Large XML Tidy-up.
+Shouldn't affect the book text or layout.  If it does, something has
+gone wrong!</para></listitem>
+
 <listitem><para>October 27th, 2001 [markh]: Chapter 6: Added 
 reiserfsprogs-3.x.0j and updated to lilo-22.0.2.</para></listitem>
 

chapter05/bash-inst.xml

@@ -15,18 +15,18 @@ or you just installed it, check for the two files again. Often the
 create <filename>libcurses.a</filename> as a symlink by running the 
 following commands:</para>
 
-<para><screen><userinput>cd /usr/lib &amp;&amp;</userinput>
-<userinput>ln -s libncurses.a libcurses.a</userinput></screen></para>
+<para><screen><userinput>cd /usr/lib &amp;&amp;
+ln -s libncurses.a libcurses.a</userinput></screen></para>
 
 <para>Now we can continue. Install Bash by running the following 
 commands:</para>
 
-<para><screen><userinput>./configure --enable-static-link --prefix=$LFS/usr \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;--bindir=$LFS/bin --with-curses &amp;&amp;</userinput>
-<userinput>make &amp;&amp;</userinput>
-<userinput>make install &amp;&amp;</userinput>
-<userinput>cd $LFS/bin &amp;&amp;</userinput>
-<userinput>ln -sf bash sh</userinput></screen></para>
+<para><screen><userinput>./configure --enable-static-link --prefix=$LFS/usr \
+&nbsp;&nbsp;&nbsp;--bindir=$LFS/bin --with-curses &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+cd $LFS/bin &amp;&amp;
+ln -sf bash sh</userinput></screen></para>
 
 <para>If the make install phase ends with something along the lines of</para>
 

chapter05/binutils-inst.xml

@@ -9,9 +9,9 @@ it comes with.</para>
 
 <para>Install Binutils by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;</userinput>
-<userinput>make LDFLAGS=-all-static tooldir=$LFS/usr &amp;&amp;</userinput>
-<userinput>make tooldir=$LFS/usr install</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;
+make LDFLAGS=-all-static tooldir=$LFS/usr &amp;&amp;
+make tooldir=$LFS/usr install</userinput></screen></para>
 
 </sect2>
 

chapter05/bzip2-inst.xml

@@ -3,10 +3,10 @@
 
 <para>Install Bzip2 by running the following commands:</para>
 
-<para><screen><userinput>make CC="gcc -static" &amp;&amp;</userinput>
-<userinput>make PREFIX=$LFS/usr install &amp;&amp;</userinput>
-<userinput>cd $LFS/usr/bin &amp;&amp;</userinput>
-<userinput>mv bzcat bunzip2 bzip2 bzip2recover $LFS/bin</userinput></screen></para>
+<para><screen><userinput>make CC="gcc -static" &amp;&amp;
+make PREFIX=$LFS/usr install &amp;&amp;
+cd $LFS/usr/bin &amp;&amp;
+mv bzcat bunzip2 bzip2 bzip2recover $LFS/bin</userinput></screen></para>
 
 <para>Although it's not strictly a part of a basic LFS system it's worth
 mentioning that a patch for Tar can be downloaded which enables the tar

chapter05/diffutils-inst.xml

@@ -7,18 +7,18 @@ following commands can be used in this case.  Note that these commands
 can also be used for other glibc versions so if you aren't sure, then
 use the first version.</para>
 
-<para><screen><userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &amp;&amp;</userinput>
-<userinput>./configure --prefix=$LFS/usr &amp;&amp;</userinput>
-<userinput>unset CPPFLAGS &amp;&amp;</userinput>
-<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
-<userinput>make install</userinput></screen></para>
+<para><screen><userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &amp;&amp;
+./configure --prefix=$LFS/usr &amp;&amp;
+unset CPPFLAGS &amp;&amp;
+make LDFLAGS=-static &amp;&amp;
+make install</userinput></screen></para>
 
 <para>If you are using a newer glibc version (2.2.x), you can use the following
 commands to install Diffutils:</para>
 
-<para><screen><userinput>./configure --prefix=$LFS/usr &amp;&amp;</userinput>
-<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
-<userinput>make install</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=$LFS/usr &amp;&amp;
+make LDFLAGS=-static &amp;&amp;
+make install</userinput></screen></para>
 
 </sect2>
 

chapter05/fileutils-exp.xml

@@ -5,11 +5,11 @@
 run this command in order to keep a backup of the file we are about to
 change.</para>
 
-<para><screen><userinput>cp lib/Makefile.in lib/Makefile.in.backup &amp;&amp;</userinput>
-<userinput>sed -e 's/\(.*\)\(fopen-safer\.c \)\\/\1\2atexit.c \\/' \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;-e 's/\(.*\)\(idcache\$U\.\$.*\)\\/\1\2atexit$U.$(OBJEXT) \\/' \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;lib/Makefile.in &gt; lib/Makefile.in~ &amp;&amp;</userinput>
-<userinput>mv lib/Makefile.in~ lib/Makefile.in:</userinput></screen>
+<para><screen><userinput>cp lib/Makefile.in lib/Makefile.in.backup &amp;&amp;
+sed -e 's/\(.*\)\(fopen-safer\.c \)\\/\1\2atexit.c \\/' \
+&nbsp;&nbsp;&nbsp;-e 's/\(.*\)\(idcache\$U\.\$.*\)\\/\1\2atexit$U.$(OBJEXT) \\/' \
+&nbsp;&nbsp;&nbsp;lib/Makefile.in &gt; lib/Makefile.in~ &amp;&amp;
+mv lib/Makefile.in~ lib/Makefile.in:</userinput></screen>
 This is used to fix a problem with building fileutils statically on glibc 2.2.3 
 systems.  If this isn't done, then there is the possibility of all of the 
 fileutils programs causing segmentation faults once chroot is entered 

chapter05/fileutils-inst.xml

@@ -21,19 +21,20 @@ machines, run the following commands. Do <emphasis>not</emphasis>
 attempt this fix if you don't have Glibc-2.2.3 installed. It will more 
 than likely result in all kinds of compile time problems.</para>
 
-<para><screen><userinput>cp lib/Makefile.in lib/Makefile.in.backup &amp;&amp;</userinput>
-<userinput>sed -e 's/\(.*\)\(fopen-safer\.c \)\\/\1\2atexit.c \\/' \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;-e 's/\(.*\)\(idcache\$U\.\$.*\)\\/\1\2atexit$U.$(OBJEXT) \\/' \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;lib/Makefile.in &gt; lib/Makefile.in~ &amp;&amp;</userinput>
-<userinput>mv lib/Makefile.in~ lib/Makefile.in</userinput></screen></para>
-
-<para>Install fileutils by running the following commands:
-<screen><userinput>./configure --disable-nls \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;--prefix=$LFS/usr --libexecdir=$LFS/bin --bindir=$LFS/bin &amp;&amp;</userinput>
-<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
-<userinput>make install &amp;&amp;</userinput>
-<userinput>cd $LFS/usr/bin &amp;&amp;</userinput>
-<userinput>ln -sf ../../bin/install</userinput></screen></para>
+<para><screen><userinput>cp lib/Makefile.in lib/Makefile.in.backup &amp;&amp;
+sed -e 's/\(.*\)\(fopen-safer\.c \)\\/\1\2atexit.c \\/' \
+&nbsp;&nbsp;&nbsp;-e 's/\(.*\)\(idcache\$U\.\$.*\)\\/\1\2atexit$U.$(OBJEXT) \\/' \
+&nbsp;&nbsp;&nbsp;lib/Makefile.in &gt; lib/Makefile.in~ &amp;&amp;
+mv lib/Makefile.in~ lib/Makefile.in</userinput></screen></para>
+
+<para>Install fileutils by running the following commands:</para>
+
+<para><screen><userinput>./configure --disable-nls \
+&nbsp;&nbsp;&nbsp;--prefix=$LFS/usr --libexecdir=$LFS/bin --bindir=$LFS/bin &amp;&amp;
+make LDFLAGS=-static &amp;&amp;
+make install &amp;&amp;
+cd $LFS/usr/bin &amp;&amp;
+ln -sf ../../bin/install</userinput></screen></para>
 
 <para>Once you have installed fileutils, you can test whether the
 segmentation fault problem has been avoided by running

chapter05/gcc-inst.xml

@@ -9,19 +9,19 @@ it comes with.</para>
 
 <para>Install GCC by running the following commands:</para>
 
-<para><screen><userinput>patch -Np1 -i ../gcc-&gcc-patch-version;.patch &amp;&amp;</userinput>
-<userinput>mkdir ../gcc-build &amp;&amp;</userinput>
-<userinput>cd ../gcc-build &amp;&amp;</userinput>
-<userinput>../gcc-&gcc-version;/configure --prefix=/usr --enable-languages=c,c++ \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;--disable-nls --disable-shared --enable-threads=posix &amp;&amp;</userinput>
-<userinput>make BOOT_LDFLAGS=-static bootstrap &amp;&amp;</userinput>
-<userinput>make prefix=$LFS/usr install &amp;&amp;</userinput>
-<userinput>cd $LFS/lib &amp;&amp;</userinput>
-<userinput>ln -sf ../usr/bin/cpp &amp;&amp;</userinput>
-<userinput>cd $LFS/usr/lib &amp;&amp;</userinput>
-<userinput>ln -sf ../bin/cpp &amp;&amp;</userinput>
-<userinput>cd $LFS/usr/bin &amp;&amp;</userinput>
-<userinput>ln -sf gcc cc</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../gcc-&gcc-patch-version;.patch &amp;&amp;
+mkdir ../gcc-build &amp;&amp;
+cd ../gcc-build &amp;&amp;
+../gcc-&gcc-version;/configure --prefix=/usr --enable-languages=c,c++ \
+&nbsp;&nbsp;&nbsp;--disable-nls --disable-shared --enable-threads=posix &amp;&amp;
+make BOOT_LDFLAGS=-static bootstrap &amp;&amp;
+make prefix=$LFS/usr install &amp;&amp;
+cd $LFS/lib &amp;&amp;
+ln -sf ../usr/bin/cpp &amp;&amp;
+cd $LFS/usr/lib &amp;&amp;
+ln -sf ../bin/cpp &amp;&amp;
+cd $LFS/usr/bin &amp;&amp;
+ln -sf gcc cc</userinput></screen></para>
 
 </sect2>
 

chapter05/grep-inst.xml

@@ -7,18 +7,18 @@ following commands can be used in this case.  Note that these commands
 can also be used for other glibc versions so if you aren't sure, then
 use the first version.</para>
 
-<para><screen><userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &amp;&amp;</userinput>
-<userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;</userinput>
-<userinput>unset CPPFLAGS &amp;&amp;</userinput>
-<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
-<userinput>make install</userinput></screen></para>
+<para><screen><userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &amp;&amp;
+./configure --prefix=$LFS/usr --disable-nls &amp;&amp;
+unset CPPFLAGS &amp;&amp;
+make LDFLAGS=-static &amp;&amp;
+make install</userinput></screen></para>
  
 <para>If you are using a newer glibc version (2.2.x), you can use the
 following commands to install Grep:</para>
  
-<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;</userinput>
-<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
-<userinput>make install</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;
+make LDFLAGS=-static &amp;&amp;
+make install</userinput></screen></para>
 
 </sect2>
 

chapter05/gzip-inst.xml

@@ -10,14 +10,15 @@ version, so if you aren't sure, it's best to apply it.</para>
 
 <para>Apply the patch by running the following command:</para>
 
-<para><userinput>patch -Np1 -i ../gzip-&gzip-version;.patch</userinput></para>
+<para><screen><userinput>patch -Np1 -i ../gzip-&gzip-version;.patch</userinput></screen></para>
 
 <para>Install Gzip by running the following commands:</para>
-<para><screen><userinput>./configure --prefix=$LFS/usr &amp;&amp;</userinput>
-<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
-<userinput>make install &amp;&amp;</userinput>
-<userinput>cp $LFS/usr/bin/gunzip $LFS/usr/bin/gzip $LFS/bin &amp;&amp;</userinput>
-<userinput>rm $LFS/usr/bin/gunzip $LFS/usr/bin/gzip</userinput></screen></para>
+
+<para><screen><userinput>./configure --prefix=$LFS/usr &amp;&amp;
+make LDFLAGS=-static &amp;&amp;
+make install &amp;&amp;
+cp $LFS/usr/bin/gunzip $LFS/usr/bin/gzip $LFS/bin &amp;&amp;
+rm $LFS/usr/bin/gunzip $LFS/usr/bin/gzip</userinput></screen></para>
 
 </sect2>
 

chapter05/kernel-inst.xml

@@ -10,15 +10,15 @@ compile the packages that need the kernel.</para>
 <para>The kernel configuration file is created by running the following 
 command:</para>
 
-<para><screen><userinput>make mrproper &amp;&amp;</userinput>
-<userinput>yes "" | make config &amp;&amp;</userinput>
-<userinput>make dep &amp;&amp;</userinput>
-<userinput>cd $LFS/usr/include &amp;&amp;</userinput>
-<userinput>cp -a ../src/linux/include/linux . &amp;&amp;</userinput>
-<userinput>chown -R root.root $LFS/usr/include/linux &amp;&amp;</userinput>
-<userinput>mkdir asm &amp;&amp;</userinput>
-<userinput>cp -a ../src/linux/include/asm/* asm &amp;&amp;</userinput>
-<userinput>chown -R root.root $LFS/usr/include/asm</userinput></screen></para>
+<para><screen><userinput>make mrproper &amp;&amp;
+yes "" | make config &amp;&amp;
+make dep &amp;&amp;
+cd $LFS/usr/include &amp;&amp;
+cp -a ../src/linux/include/linux . &amp;&amp;
+chown -R root.root $LFS/usr/include/linux &amp;&amp;
+mkdir asm &amp;&amp;
+cp -a ../src/linux/include/asm/* asm &amp;&amp;
+chown -R root.root $LFS/usr/include/asm</userinput></screen></para>
 
 </sect2>
 

chapter05/make-inst.xml

@@ -3,9 +3,9 @@
 
 <para>Install Make by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;</userinput>
-<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
-<userinput>make install</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;
+make LDFLAGS=-static &amp;&amp;
+make install</userinput></screen></para>
 
 </sect2>
 

chapter05/mawk-inst.xml

@@ -3,10 +3,10 @@
 
 <para>Install Mawk by running the following commands:</para>
 
-<para><screen><userinput>./configure &amp;&amp;</userinput>
-<userinput>make CC="gcc -static" &amp;&amp;</userinput>
-<userinput>make BINDIR=$LFS/usr/bin \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;MANDIR=$LFS/usr/share/man/man1 install</userinput></screen></para>
+<para><screen><userinput>./configure &amp;&amp;
+make CC="gcc -static" &amp;&amp;
+make BINDIR=$LFS/usr/bin \
+&nbsp;&nbsp;&nbsp;MANDIR=$LFS/usr/share/man/man1 install</userinput></screen></para>
 
 </sect2>
 

chapter05/patch-inst.xml

@@ -3,9 +3,9 @@
 
 <para>Install Patch by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=$LFS/usr &amp;&amp;</userinput>
-<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
-<userinput>make install</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=$LFS/usr &amp;&amp;
+make LDFLAGS=-static &amp;&amp;
+make install</userinput></screen></para>
 
 </sect2>
 

chapter05/sed-inst.xml

@@ -7,18 +7,18 @@ following commands can be used in this case.  Note that these commands
 can also be used for other glibc versions so if you aren't sure, then
 use the first version.</para>
 
-<para><screen><userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &amp;&amp;</userinput>
-<userinput>./configure --prefix=$LFS/usr --bindir=$LFS/bin &amp;&amp;</userinput>
-<userinput>unset CPPFLAGS &amp;&amp;</userinput>
-<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
-<userinput>make install</userinput></screen></para>
+<para><screen><userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &amp;&amp;
+./configure --prefix=$LFS/usr --bindir=$LFS/bin &amp;&amp;
+unset CPPFLAGS &amp;&amp;
+make LDFLAGS=-static &amp;&amp;
+make install</userinput></screen></para>
  
 <para>If you are using a newer glibc version (2.2.x), you can use the
 following commands to install Sed:</para>
  
-<para><screen><userinput>./configure --prefix=$LFS/usr --bindir=$LFS/bin &amp;&amp;</userinput>
-<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
-<userinput>make install</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=$LFS/usr --bindir=$LFS/bin &amp;&amp;
+make LDFLAGS=-static &amp;&amp;
+make install</userinput></screen></para>
 
 </sect2>
 

chapter05/shellutils-inst.xml

@@ -13,12 +13,13 @@ best to apply it.</para>
 <para><screen><userinput>patch -Np1 -i ../sh-utils-&sh-utils-version;.patch</userinput></screen></para>
 
 <para>Install Sh-utils by running the following commands:</para>
-<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;</userinput>
-<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
-<userinput>make install &amp;&amp;</userinput>
-<userinput>cd $LFS/usr/bin &amp;&amp;</userinput>
-<userinput>mv date echo false pwd stty $LFS/bin &amp;&amp;</userinput>
-<userinput>mv su true uname hostname $LFS/bin</userinput></screen></para>
+
+<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;
+make LDFLAGS=-static &amp;&amp;
+make install &amp;&amp;
+cd $LFS/usr/bin &amp;&amp;
+mv date echo false pwd stty $LFS/bin &amp;&amp;
+mv su true uname hostname $LFS/bin</userinput></screen></para>
 
 </sect2>
 

chapter05/tar-inst.xml

@@ -12,10 +12,10 @@ for gzip files).</para>
 
 <para>Install Tar by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;--libexecdir=$LFS/usr/bin --bindir=$LFS/bin &amp;&amp; </userinput>
-<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
-<userinput>make install</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls \
+&nbsp;&nbsp;&nbsp;--libexecdir=$LFS/usr/bin --bindir=$LFS/bin &amp;&amp; 
+make LDFLAGS=-static &amp;&amp;
+make install</userinput></screen></para>
 
 </sect2>
 

chapter05/texinfo-inst.xml

@@ -3,9 +3,9 @@
 
 <para>Install Texinfo by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;</userinput>
-<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
-<userinput>make install</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;
+make LDFLAGS=-static &amp;&amp;
+make install</userinput></screen></para>
 
 </sect2>
 

chapter05/textutils-inst.xml

@@ -3,10 +3,10 @@
 
 <para>Install Textutils by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;</userinput>
-<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
-<userinput>make install &amp;&amp;</userinput>
-<userinput>mv $LFS/usr/bin/cat $LFS/bin</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;
+make LDFLAGS=-static &amp;&amp;
+make install &amp;&amp;
+mv $LFS/usr/bin/cat $LFS/bin</userinput></screen></para>
 
 </sect2>
 

chapter06/autoconf-inst.xml

@@ -8,9 +8,9 @@ start experiencing any problems with this release.</para>
 
 <para>Install Autoconf by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-<userinput>make &amp;&amp;</userinput>
-<userinput>make install</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
 
 </sect2>
 

chapter06/automake-inst.xml

@@ -8,8 +8,8 @@ start experiencing any problems with this release.</para>
 
 <para>Install Automake by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-<userinput>make install</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make install</userinput></screen></para>
 
 </sect2>
 

chapter06/bash-inst.xml

@@ -3,11 +3,11 @@
 
 <para>Install Bash by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr --with-curses \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;--bindir=/bin &amp;&amp;</userinput>
-<userinput>make &amp;&amp;</userinput>
-<userinput>make install &amp;&amp;</userinput>
-<userinput>exec /bin/bash --login</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=/usr --with-curses \
+&nbsp;&nbsp;&nbsp;--bindir=/bin &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+exec /bin/bash --login</userinput></screen></para>
 
 </sect2>
 

chapter06/bin86-inst.xml

@@ -14,8 +14,8 @@ you decide to skip this.</para>
 
 <para>Install Bin86 by running the following commands:</para>
 
-<para><screen><userinput>make &amp;&amp;</userinput>
-<userinput>make PREFIX=/usr install</userinput></screen></para>
+<para><screen><userinput>make &amp;&amp;
+make PREFIX=/usr install</userinput></screen></para>
 
 </sect2>
 

chapter06/binutils-inst.xml

@@ -8,10 +8,10 @@ it comes with.</para>
 
 <para>Install Binutils by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr --enable-shared &amp;&amp;</userinput>
-<userinput>make tooldir=/usr &amp;&amp;</userinput>
-<userinput>make tooldir=/usr install &amp;&amp;</userinput>
-<userinput>make tooldir=/usr install-info</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=/usr --enable-shared &amp;&amp;
+make tooldir=/usr &amp;&amp;
+make tooldir=/usr install &amp;&amp;
+make tooldir=/usr install-info</userinput></screen></para>
 
 </sect2>
 

chapter06/bison-inst.xml

@@ -3,10 +3,10 @@
 
 <para>Install Bison by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;--datadir=/usr/share/bison &amp;&amp;</userinput>
-<userinput>make &amp;&amp;</userinput>
-<userinput>make install</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=/usr \
+&nbsp;&nbsp;&nbsp;--datadir=/usr/share/bison &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
 
 <para>Some programs don't know about bison and try to find the yacc program
 (bison is a (better) alternative for yacc). So to please those few
@@ -23,8 +23,8 @@ following:</para>
 exec /usr/bin/bison -y "$@"
 
 # End /usr/bin/yacc
-<userinput>EOF</userinput>
-<userinput>chmod 755 /usr/bin/yacc</userinput></screen></para>
+<userinput>EOF
+chmod 755 /usr/bin/yacc</userinput></screen></para>
 
 </sect2>
 

chapter06/bzip2-inst.xml

@@ -3,25 +3,25 @@
 
 <para>Install Bzip2 by running the following commands:</para>
 
-<para><screen><userinput>make -f Makefile-libbz2_so &amp;&amp;</userinput>
-<userinput>make bzip2recover libbz2.a &amp;&amp;</userinput>
-<userinput>ln -s libbz2.so.1.0.1 libbz2.so &amp;&amp;</userinput>
-<userinput>cp bzip2-shared /bin/bzip2 &amp;&amp;</userinput>
-<userinput>cp bzip2recover /bin &amp;&amp;</userinput>
-<userinput>cp bzip2.1 /usr/share/man/man1 &amp;&amp;</userinput>
-<userinput>cp bzlib.h /usr/include &amp;&amp;</userinput>
-<userinput>cp -a libbz2.so* /lib &amp;&amp;</userinput>
-<userinput>rm /usr/lib/libbz2.a &amp;&amp;</userinput>
-<userinput>cp libbz2.a /usr/lib &amp;&amp;</userinput>
-<userinput>cd /usr/lib &amp;&amp;</userinput>
-<userinput>ln -sf ../../lib/libbz2.so &amp;&amp;</userinput>
-<userinput>cd /bin &amp;&amp;</userinput>
-<userinput>ln -sf bzip2 bunzip2 &amp;&amp;</userinput>
-<userinput>ln -sf bzip2 bzcat &amp;&amp;</userinput>
-<userinput>cd /usr/share/man/man1 &amp;&amp;</userinput>
-<userinput>ln -sf bzip2.1 bunzip2.1 &amp;&amp;</userinput>
-<userinput>ln -sf bzip2.1 bzcat.1 &amp;&amp;</userinput>
-<userinput>ln -sf bzip2.1 bzip2recover.1</userinput></screen></para>
+<para><screen><userinput>make -f Makefile-libbz2_so &amp;&amp;
+make bzip2recover libbz2.a &amp;&amp;
+ln -s libbz2.so.1.0.1 libbz2.so &amp;&amp;
+cp bzip2-shared /bin/bzip2 &amp;&amp;
+cp bzip2recover /bin &amp;&amp;
+cp bzip2.1 /usr/share/man/man1 &amp;&amp;
+cp bzlib.h /usr/include &amp;&amp;
+cp -a libbz2.so* /lib &amp;&amp;
+rm /usr/lib/libbz2.a &amp;&amp;
+cp libbz2.a /usr/lib &amp;&amp;
+cd /usr/lib &amp;&amp;
+ln -sf ../../lib/libbz2.so &amp;&amp;
+cd /bin &amp;&amp;
+ln -sf bzip2 bunzip2 &amp;&amp;
+ln -sf bzip2 bzcat &amp;&amp;
+cd /usr/share/man/man1 &amp;&amp;
+ln -sf bzip2.1 bunzip2.1 &amp;&amp;
+ln -sf bzip2.1 bzcat.1 &amp;&amp;
+ln -sf bzip2.1 bzip2recover.1</userinput></screen></para>
 
 <para>Although it's not strictly a part of a basic LFS system it's worth
 mentioning that a patch for Tar can be downloaded which enables the tar

chapter06/chrootcmd.xml

@@ -1,3 +1,3 @@
-<userinput>cd $LFS &amp;&amp;</userinput>
-<userinput>chroot $LFS /usr/bin/env -i HOME=/root \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;TERM=$TERM /bin/bash --login</userinput>
+<userinput>cd $LFS &amp;&amp;
+chroot $LFS /usr/bin/env -i HOME=/root \
+&nbsp;&nbsp;&nbsp;TERM=$TERM /bin/bash --login</userinput>

chapter06/config-glibc.xml

@@ -38,8 +38,8 @@ location of the needed timezone file.</para>
 <para> Create the <filename class="directory">/etc/localtime</filename> symlink
 by running:</para>
 
-<para><screen><userinput>cd /etc &amp;&amp;</userinput>
-<userinput>ln -sf ../usr/share/zoneinfo/&lt;tzselect's output&gt; localtime</userinput></screen></para>
+<para><screen><userinput>cd /etc &amp;&amp;
+ln -sf ../usr/share/zoneinfo/&lt;tzselect's output&gt; localtime</userinput></screen></para>
 
 <para>tzselect's output can be something like <emphasis>EST5EDT</emphasis> or
 <emphasis>Canada/Eastern</emphasis>.</para>

chapter06/create-utmp.xml

@@ -11,10 +11,10 @@ bad 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/wtmp \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp; /var/log/btmp /var/log/lastlog &amp;&amp;</userinput>
-<userinput>chmod 644 /var/run/utmp /var/log/wtmp \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;/var/log/btmp /var/log/lastlog</userinput></screen></para>
+<para><screen><userinput>touch /var/run/utmp /var/log/wtmp \
+&nbsp;&nbsp;&nbsp; /var/log/btmp /var/log/lastlog &amp;&amp;
+chmod 644 /var/run/utmp /var/log/wtmp \
+&nbsp;&nbsp;&nbsp;/var/log/btmp /var/log/lastlog</userinput></screen></para>
 
 </sect2>
 

chapter06/diffutils-inst.xml

@@ -3,9 +3,9 @@
 
 <para>Install Diffutils by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-<userinput>make &amp;&amp;</userinput>
-<userinput>make install</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
 
 </sect2>
 

chapter06/e2fsprogs-inst.xml

@@ -3,11 +3,11 @@
 
 <para>Install E2fsprogs by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr --with-root-prefix="" \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;--enable-elf-shlibs &amp;&amp;</userinput>
-<userinput>make &amp;&amp;</userinput>
-<userinput>make install &amp;&amp;</userinput>
-<userinput>make install-libs</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=/usr --with-root-prefix="" \
+&nbsp;&nbsp;&nbsp;--enable-elf-shlibs &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+make install-libs</userinput></screen></para>
 
 </sect2>
 

chapter06/ed-inst.xml

@@ -8,15 +8,15 @@ need to use ed, you can skip it.</para>
 
 <para>Install Ed by running the following commands:</para>
 
-<para><screen><userinput>cp buf.c buf.c.backup &amp;&amp;</userinput>
-<userinput>sed 's/int u/int u, sfd/' buf.c.backup | \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;sed '/.*\*mktemp.*/d' | \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;sed 's/.*if (mktemp.*/  sfd = mkstemp(sfn);\</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;if ((sfd == -1) || (sfp = fopen (sfn, "w+")) == NULL)/' &gt; buf.c &amp;&amp;</userinput>
-<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-<userinput>make &amp;&amp;</userinput>
-<userinput>make install &amp;&amp;</userinput>
-<userinput>mv /usr/bin/ed /usr/bin/red /bin</userinput></screen></para>
+<para><screen><userinput>cp buf.c buf.c.backup &amp;&amp;
+sed 's/int u/int u, sfd/' buf.c.backup | \
+&nbsp;&nbsp;&nbsp;sed '/.*\*mktemp.*/d' | \
+&nbsp;&nbsp;&nbsp;sed 's/.*if (mktemp.*/  sfd = mkstemp(sfn);\
+&nbsp;&nbsp;&nbsp;if ((sfd == -1) || (sfp = fopen (sfn, "w+")) == NULL)/' &gt; buf.c &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+mv /usr/bin/ed /usr/bin/red /bin</userinput></screen></para>
 
 </sect2>
 

chapter06/file-inst.xml

@@ -3,11 +3,11 @@
 
 <para>Install File by running the following commands:</para>
 
-<para><screen><userinput>cp readelf.h readelf.h.backup &amp;&amp;</userinput>
-<userinput>sed $'/#define __/a \\\n#include &lt;stdint.h&gt;' readelf.h.backup &gt; readelf.h &amp;&amp;</userinput>
-<userinput>./configure --prefix=/usr --datadir=/usr/share/misc &amp;&amp;</userinput>
-<userinput>make &amp;&amp;</userinput>
-<userinput>make install</userinput></screen></para>
+<para><screen><userinput>cp readelf.h readelf.h.backup &amp;&amp;
+sed $'/#define __/a \\\n#include &lt;stdint.h&gt;' readelf.h.backup &gt; readelf.h &amp;&amp;
+./configure --prefix=/usr --datadir=/usr/share/misc &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
 
 <para>File uses magic numbers to determine a file type. These magic numbers 
 come with File in a plain text file.  File internally compiles this database 

chapter06/fileutils-inst.xml

@@ -3,10 +3,10 @@
 
 <para>Install Fileutils by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr --bindir=/bin \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;--libexecdir=/bin &amp;&amp;</userinput>
-<userinput>make &amp;&amp;</userinput>
-<userinput>make install</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=/usr --bindir=/bin \
+&nbsp;&nbsp;&nbsp;--libexecdir=/bin &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
 
 </sect2>
 

chapter06/findutils-inst.xml

@@ -6,10 +6,10 @@ to be unpacked.</para>
 
 <para>Install Findutils by running the following commands:</para>
 
-<para><screen><userinput>patch -Np1 -i ../findutils-4.1.patch &amp;&amp;</userinput>
-<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-<userinput>make &amp;&amp;</userinput>
-<userinput>make libexecdir=/usr/bin install</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../findutils-4.1.patch &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make libexecdir=/usr/bin install</userinput></screen></para>
 
 </sect2>
 

chapter06/flex-inst.xml

@@ -3,11 +3,11 @@
 
 <para>Install Flex by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-<userinput>make &amp;&amp;</userinput>
-<userinput>make install &amp;&amp;</userinput>
-<userinput>cd /usr/bin &amp;&amp;</userinput>
-<userinput>ln -sf flex lex</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+cd /usr/bin &amp;&amp;
+ln -sf flex lex</userinput></screen></para>
 
 </sect2>
 

chapter06/gcc-inst.xml

@@ -17,13 +17,13 @@ are available.</para>
 <para>Note: the build of other compilers is not tested by the people 
 who actively work on LFS.</para>
 
-<para><screen><userinput>patch -Np1 -i ../gcc-&gcc-patch-version;.patch &amp;&amp;</userinput>
-<userinput>mkdir ../gcc-build &amp;&amp;</userinput>
-<userinput>cd ../gcc-build &amp;&amp;</userinput>
-<userinput>../gcc-&gcc-version;/configure --prefix=/usr --enable-shared \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;--enable-languages=c,c++ --enable-threads=posix &amp;&amp;</userinput>
-<userinput>make bootstrap &amp;&amp;</userinput>
-<userinput>make install</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../gcc-&gcc-patch-version;.patch &amp;&amp;
+mkdir ../gcc-build &amp;&amp;
+cd ../gcc-build &amp;&amp;
+../gcc-&gcc-version;/configure --prefix=/usr --enable-shared \
+&nbsp;&nbsp;&nbsp;--enable-languages=c,c++ --enable-threads=posix &amp;&amp;
+make bootstrap &amp;&amp;
+make install</userinput></screen></para>
 
 </sect2>
 

chapter06/gettext-inst.xml

@@ -3,9 +3,9 @@
 
 <para>Install Gettext by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-<userinput>make &amp;&amp;</userinput>
-<userinput>make install</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
 
 </sect2>
 

chapter06/glibc-inst.xml

@@ -14,26 +14,26 @@ it comes with.</para>
 
 <para>Install Glibc by running the following commands:</para>
 
-<para><screen><userinput>mknod -m 0666 /dev/null c 1 3 &amp;&amp;</userinput>
-<userinput>touch /etc/ld.so.conf &amp;&amp;</userinput>
-<userinput>cp malloc/Makefile malloc/Makefile.backup &amp;&amp;</userinput>
-<userinput>sed 's%\$(PERL)%/usr/bin/perl%' malloc/Makefile &gt; tmp~ &amp;&amp;</userinput>
-<userinput>mv tmp~ malloc/Makefile &amp;&amp;</userinput>
-<userinput>cp login/Makefile login/Makefile.backup &amp;&amp;</userinput>
-<userinput>sed 's/root/0/' login/Makefile &gt; tmp~ &amp;&amp;</userinput>
-<userinput>mv tmp~ login/Makefile &amp;&amp;</userinput>
-<userinput>mkdir ../glibc-build &amp;&amp;</userinput>
-<userinput>cd ../glibc-build &amp;&amp;</userinput>
-<userinput>../glibc-&glibc-version;/configure --prefix=/usr \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;--enable-add-ons --libexecdir=/usr/bin &amp;&amp;</userinput>
-<userinput>cp config.make config.make.backup &amp;&amp;</userinput>
-<userinput>sed 's/cross-compiling = yes/cross-compiling = no/' \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;config.make &gt; tmp~ &amp;&amp;</userinput>
-<userinput>mv tmp~ config.make &amp;&amp;</userinput>
-<userinput>make &amp;&amp;</userinput>
-<userinput>make install &amp;&amp;</userinput>
-<userinput>make localedata/install-locales &amp;&amp;</userinput>
-<userinput>exec /bin/bash --login</userinput></screen></para>
+<para><screen><userinput>mknod -m 0666 /dev/null c 1 3 &amp;&amp;
+touch /etc/ld.so.conf &amp;&amp;
+cp malloc/Makefile malloc/Makefile.backup &amp;&amp;
+sed 's%\$(PERL)%/usr/bin/perl%' malloc/Makefile &gt; tmp~ &amp;&amp;
+mv tmp~ malloc/Makefile &amp;&amp;
+cp login/Makefile login/Makefile.backup &amp;&amp;
+sed 's/root/0/' login/Makefile &gt; tmp~ &amp;&amp;
+mv tmp~ login/Makefile &amp;&amp;
+mkdir ../glibc-build &amp;&amp;
+cd ../glibc-build &amp;&amp;
+../glibc-&glibc-version;/configure --prefix=/usr \
+&nbsp;&nbsp;&nbsp;--enable-add-ons --libexecdir=/usr/bin &amp;&amp;
+cp config.make config.make.backup &amp;&amp;
+sed 's/cross-compiling = yes/cross-compiling = no/' \
+&nbsp;&nbsp;&nbsp;config.make &gt; tmp~ &amp;&amp;
+mv tmp~ config.make &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+make localedata/install-locales &amp;&amp;
+exec /bin/bash --login</userinput></screen></para>
 
 <para>An alternative to running <userinput>make
 localedata/install-locales</userinput> is to only install those locales

chapter06/grep-inst.xml

@@ -3,9 +3,9 @@
 
 <para>Install Grep by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-<userinput>make &amp;&amp;</userinput>
-<userinput>make install</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
 
 </sect2>
 

chapter06/groff-inst.xml

@@ -3,9 +3,9 @@
 
 <para>Install Groff by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-<userinput>make &amp;&amp;</userinput>
-<userinput>make install</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
 
 </sect2>
 

chapter06/gzip-inst.xml

@@ -3,17 +3,17 @@
 
 <para>Install Gzip by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-<userinput>make &amp;&amp;</userinput>
-<userinput>make install &amp;&amp;</userinput>
-<userinput>cd /usr/bin &amp;&amp;</userinput>
-<userinput>mv gzip /bin &amp;&amp;</userinput>
-<userinput>rm gunzip zcat &amp;&amp;</userinput>
-<userinput>cd /bin &amp;&amp;</userinput>
-<userinput>ln -sf gzip gunzip &amp;&amp;</userinput>
-<userinput>ln -sf gzip zcat &amp;&amp;</userinput>
-<userinput>ln -sf gzip compress &amp;&amp;</userinput>
-<userinput>ln -sf gunzip uncompress</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+cd /usr/bin &amp;&amp;
+mv gzip /bin &amp;&amp;
+rm gunzip zcat &amp;&amp;
+cd /bin &amp;&amp;
+ln -sf gzip gunzip &amp;&amp;
+ln -sf gzip zcat &amp;&amp;
+ln -sf gzip compress &amp;&amp;
+ln -sf gunzip uncompress</userinput></screen></para>
 
 </sect2>
 

chapter06/kbd-inst.xml

@@ -3,9 +3,9 @@
 
 <para>Install Kbd by running the following commands:</para>
 
-<para><screen><userinput>./configure &amp;&amp;</userinput>
-<userinput>make &amp;&amp;</userinput>
-<userinput>make install</userinput></screen></para>
+<para><screen><userinput>./configure &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
 
 <para>When using the loadkeys program from this package, don't use the
 -d option to load a default keymap file. It won't work properly

chapter06/less-inst.xml

@@ -3,9 +3,9 @@
 
 <para>Install Less by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr --bindir=/bin &amp;&amp;</userinput>
-<userinput>make &amp;&amp;</userinput>
-<userinput>make install</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=/usr --bindir=/bin &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
 
 </sect2>
 

chapter06/libtool-inst.xml

@@ -3,9 +3,9 @@
 
 <para>Install Libtool by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-<userinput>make &amp;&amp;</userinput>
-<userinput>make install</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
 
 </sect2>
 

chapter06/lilo-inst.xml

@@ -9,8 +9,8 @@ url="&hints-root;grub-howto.txt">&hints-root;grub-howto.txt</ulink>,
 
 <para>Install Lilo by running the following commands:</para>
 
-<para><screen><userinput>make &amp;&amp;</userinput>
-<userinput>make install</userinput></screen></para>
+<para><screen><userinput>make &amp;&amp;
+make install</userinput></screen></para>
 
 <para>It appears that compilation of this package fails on certain machines
 when the -g compiler flag is being used. If you can't compile Lilo at

chapter06/m4-inst.xml

@@ -3,9 +3,9 @@
 
 <para>Install M4 by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-<userinput>make &amp;&amp;</userinput>
-<userinput>make install</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
 
 </sect2>
 

chapter06/make-inst.xml

@@ -3,9 +3,9 @@
 
 <para>Install Make by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-<userinput>make &amp;&amp;</userinput>
-<userinput>make install</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
 
 </sect2>
 

chapter06/makedev-inst.xml

@@ -6,9 +6,9 @@ won't create a directory for you to cd into.</para>
 
 <para>Create the device files by running the following commands:</para>
 
-<para><screen><userinput>cp MAKEDEV-&makedev-version; /dev/MAKEDEV &amp;&amp;</userinput>
-<userinput>cd /dev &amp;&amp;</userinput>
-<userinput>chmod 754 MAKEDEV</userinput></screen></para>
+<para><screen><userinput>cp MAKEDEV-&makedev-version; /dev/MAKEDEV &amp;&amp;
+cd /dev &amp;&amp;
+chmod 754 MAKEDEV</userinput></screen></para>
 
 <para>Now, depending on whether you are going to use devpts or not, you
 can run one of two commands:</para>

chapter06/man-inst.xml

@@ -3,16 +3,16 @@
 
 <para>Run the following commands to install man:</para>
 
-<para><screen><userinput>for i in configure src/Makefile.in src/makewhatis.sh</userinput>
-<userinput>do</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;cp $i $i.backup &amp;&amp;</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;sed 's/gawk/awk/g' $i &gt; tmp~ &amp;&amp;</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;mv tmp~ $i</userinput>
-<userinput>done &amp;&amp;</userinput>
-<userinput>chmod 755 configure &amp;&amp;</userinput>
-<userinput>./configure -default &amp;&amp;</userinput>
-<userinput>make &amp;&amp;</userinput>
-<userinput>make install</userinput></screen></para>
+<para><screen><userinput>for i in configure src/Makefile.in src/makewhatis.sh
+do
+&nbsp;&nbsp;&nbsp;cp $i $i.backup &amp;&amp;
+&nbsp;&nbsp;&nbsp;sed 's/gawk/awk/g' $i &gt; tmp~ &amp;&amp;
+&nbsp;&nbsp;&nbsp;mv tmp~ $i
+done &amp;&amp;
+chmod 755 configure &amp;&amp;
+./configure -default &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
 
 <para>You may want to take a look at the man hint at <ulink
 url="&hints-root;man.txt">&hints-root;man.txt</ulink> 

chapter06/manpages-inst.xml

@@ -4,8 +4,8 @@
 <para>Before man-pages is installed, the patch file has to be unpacked.  
 Install Man-pages by running the following commands:</para>
 
-<para><screen><userinput>patch -Np1 -i ../man-pages-&man-pages-version;.patch &amp;&amp;</userinput>
-<userinput>make install</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../man-pages-&man-pages-version;.patch &amp;&amp;
+make install</userinput></screen></para>
 
 </sect2>
 

chapter06/mawk-inst.xml

@@ -3,12 +3,12 @@
 
 <para>Install Mawk by running the following commands:</para>
 
-<para><screen><userinput>./configure &amp;&amp;</userinput>
-<userinput>make &amp;&amp;</userinput>
-<userinput>make BINDIR=/usr/bin \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;MANDIR=/usr/share/man/man1 install &amp;&amp;</userinput>
-<userinput>cd /usr/bin &amp;&amp;</userinput>
-<userinput>ln -sf mawk awk</userinput></screen></para>
+<para><screen><userinput>./configure &amp;&amp;
+make &amp;&amp;
+make BINDIR=/usr/bin \
+&nbsp;&nbsp;&nbsp;MANDIR=/usr/share/man/man1 install &amp;&amp;
+cd /usr/bin &amp;&amp;
+ln -sf mawk awk</userinput></screen></para>
 
 </sect2>
 

chapter06/modutils-inst.xml

@@ -3,9 +3,9 @@
 
 <para>Install Modutils by running the following commands:</para>
 
-<para><screen><userinput>./configure &amp;&amp;</userinput>
-<userinput>make &amp;&amp;</userinput>
-<userinput>make install</userinput></screen></para>
+<para><screen><userinput>./configure &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
 
 </sect2>
 

chapter06/ncurses-inst.xml

@@ -3,19 +3,19 @@
 
 <para>Install Ncurses by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr --libdir=/lib \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;--with-shared --disable-termcap &amp;&amp;</userinput>
-<userinput>make &amp;&amp;</userinput>
-<userinput>make install &amp;&amp;</userinput>
-<userinput>cd /lib &amp;&amp;</userinput>
-<userinput>mv *.a /usr/lib &amp;&amp;</userinput>
-<userinput>chmod 755 *.5.2 &amp;&amp;</userinput>
-<userinput>cd /usr/lib &amp;&amp;</userinput>
-<userinput>ln -sf libncurses.a libcurses.a &amp;&amp;</userinput>
-<userinput>ln -sf ../../lib/libncurses.so &amp;&amp;</userinput>
-<userinput>ln -sf ../../lib/libcurses.so &amp;&amp;</userinput>
-<userinput>ln -sf ../../lib/libform.so &amp;&amp;</userinput>
-<userinput>ln -sf ../../lib/libpanel.so &amp;&amp;</userinput>
-<userinput>ln -sf ../../lib/libmenu.so</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=/usr --libdir=/lib \
+&nbsp;&nbsp;&nbsp;--with-shared --disable-termcap &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+cd /lib &amp;&amp;
+mv *.a /usr/lib &amp;&amp;
+chmod 755 *.5.2 &amp;&amp;
+cd /usr/lib &amp;&amp;
+ln -sf libncurses.a libcurses.a &amp;&amp;
+ln -sf ../../lib/libncurses.so &amp;&amp;
+ln -sf ../../lib/libcurses.so &amp;&amp;
+ln -sf ../../lib/libform.so &amp;&amp;
+ln -sf ../../lib/libpanel.so &amp;&amp;
+ln -sf ../../lib/libmenu.so</userinput></screen></para>
 </sect2>
 

chapter06/netkitbase-inst.xml

@@ -3,11 +3,11 @@
 
 <para>Install Netkit-base by running the following commands:</para>
 
-<para><screen><userinput>./configure &amp;&amp;</userinput>
-<userinput>make &amp;&amp;</userinput>
-<userinput>make install &amp;&amp;</userinput>
-<userinput>cd etc.sample &amp;&amp;</userinput>
-<userinput>cp services protocols /etc</userinput></screen></para>
+<para><screen><userinput>./configure &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+cd etc.sample &amp;&amp;
+cp services protocols /etc</userinput></screen></para>
 
 <para>There are other files in the <filename
 class="directory">etc.sample</filename> directory which might be of

chapter06/nettools-inst.xml

@@ -3,8 +3,8 @@
 
 <para>Install Net-tools by running the following commands:</para>
 
-<para><screen><userinput>make &amp;&amp;</userinput>
-<userinput>make update</userinput></screen></para>
+<para><screen><userinput>make &amp;&amp;
+make update</userinput></screen></para>
 
 </sect2>
 

chapter06/patch-inst.xml

@@ -3,9 +3,9 @@
 
 <para>Install Patch by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-<userinput>make &amp;&amp;</userinput>
-<userinput>make install</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
 
 </sect2>
 

chapter06/perl-inst.xml

@@ -3,9 +3,9 @@
 
 <para>Install Perl by running the following commands:</para>
 
-<para><screen><userinput>./Configure -Dprefix=/usr &amp;&amp;</userinput>
-<userinput>make &amp;&amp;</userinput>
-<userinput>make install</userinput></screen></para>
+<para><screen><userinput>./Configure -Dprefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
 
 <para>If you don't want to answer all those questions Perl asks, you can
 add the -d option to the configure script and Perl will use all the
@@ -13,9 +13,9 @@ default settings. To avoid the Configure script asking questions
 after the config.sh file has been created you can pass the -e parameter
 to perl as well. The commands with these parameters included will be:</para>
 
-<para><screen><userinput>./Configure -Dprefix=/usr -d -e &amp;&amp;</userinput>
-<userinput>make &amp;&amp;</userinput>
-<userinput>make install</userinput></screen></para>
+<para><screen><userinput>./Configure -Dprefix=/usr -d -e &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
 
 </sect2>
 

chapter06/procinfo-inst.xml

@@ -3,8 +3,8 @@
 
 <para>Install Procinfo by running the following commands:</para>
 
-<para><screen><userinput>make LDLIBS=-lncurses &amp;&amp;</userinput>
-<userinput>make install</userinput></screen></para>
+<para><screen><userinput>make LDLIBS=-lncurses &amp;&amp;
+make install</userinput></screen></para>
 
 </sect2>
 

chapter06/procps-inst.xml

@@ -3,9 +3,9 @@
 
 <para>Install Procps by running the following commands:</para>
 
-<para><screen><userinput>make &amp;&amp;</userinput>
-<userinput>make XSCPT='' install &amp;&amp;</userinput>
-<userinput>mv /usr/bin/kill /bin</userinput></screen></para>
+<para><screen><userinput>make &amp;&amp;
+make XSCPT='' install &amp;&amp;
+mv /usr/bin/kill /bin</userinput></screen></para>
 
 </sect2>
 

chapter06/psmisc-inst.xml

@@ -3,9 +3,9 @@
 
 <para>Install Psmisc by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr --exec-prefix=/ &amp;&amp;</userinput>
-<userinput>make &amp;&amp;</userinput>
-<userinput>make install</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=/usr --exec-prefix=/ &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
 
 <para>psmisc installs the
 <filename>/usr/share/man/man1/pidof.1</filename> man page, but psmisc's
@@ -23,8 +23,8 @@ should remove psmisc's pidof man page by running:</para>
 package's installation by creating the <filename>/bin/pidof</filename>
 symlink by running:</para>
 
-<para><screen><userinput>cd /bin</userinput>
-<userinput>ln -s killall pidof</userinput></screen></para>
+<para><screen><userinput>cd /bin
+ln -s killall pidof</userinput></screen></para>
 
 </sect2>
 

chapter06/reiserfs-inst.xml

@@ -5,9 +5,9 @@
 the reiserfs filesystem.  Install Reiserfsprogs by running the 
 following commands:</para>
 
-<para><screen><userinput>./configure --mandir=/usr/share/man &&</userinput>
-<userinput>make &&</userinput>
-<userinput>make install</userinput></screen></para>
+<para><screen><userinput>./configure --mandir=/usr/share/man &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
 
 </sect2>
 

chapter06/sed-inst.xml

@@ -3,9 +3,9 @@
 
 <para>Install Sed by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr --bindir=/bin &amp;&amp;</userinput>
-<userinput>make &amp;&amp;</userinput>
-<userinput>make install</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=/usr --bindir=/bin &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
 
 </sect2>
 

chapter06/shadowpwd-inst.xml

@@ -9,22 +9,22 @@ passwords and how to get the most out of this Shadow package.</para>
 <para>Install the Shadow Password Suite by running the 
 following commands:</para>
 
-<para><screen><userinput>cp src/useradd.c src/useradd.c.backup &amp;&amp;</userinput>
-<userinput>sed 's/\(.*\) (nflg || \(.*\))\(.*\)/\1\2\3/' \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;src/useradd.c &gt; tmp~ &amp;&amp;</userinput>
-<userinput>mv tmp~ src/useradd.c &amp;&amp;</userinput>
-<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-<userinput>make &amp;&amp;</userinput>
-<userinput>make install &amp;&amp;</userinput>
-<userinput>cd etc &amp;&amp;</userinput>
-<userinput>cp limits login.access /etc &amp;&amp;</userinput>
-<userinput>sed 's%/var/spool/mail%/var/mail%' login.defs.linux &gt; /etc/login.defs &amp;&amp;</userinput>
-<userinput>cd /lib &amp;&amp;</userinput>
-<userinput>mv libshadow.a /usr/lib &amp;&amp;</userinput>
-<userinput>mv libshadow.la /usr/lib &amp;&amp;</userinput>
-<userinput>ln -sf libshadow.so.0 libshadow.so &amp;&amp;</userinput>
-<userinput>cd /usr/lib &amp;&amp;</userinput>
-<userinput>ln -sf ../../lib/libshadow.so</userinput></screen></para>
+<para><screen><userinput>cp src/useradd.c src/useradd.c.backup &amp;&amp;
+sed 's/\(.*\) (nflg || \(.*\))\(.*\)/\1\2\3/' \
+&nbsp;&nbsp;&nbsp;src/useradd.c &gt; tmp~ &amp;&amp;
+mv tmp~ src/useradd.c &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+cd etc &amp;&amp;
+cp limits login.access /etc &amp;&amp;
+sed 's%/var/spool/mail%/var/mail%' login.defs.linux &gt; /etc/login.defs &amp;&amp;
+cd /lib &amp;&amp;
+mv libshadow.a /usr/lib &amp;&amp;
+mv libshadow.la /usr/lib &amp;&amp;
+ln -sf libshadow.so.0 libshadow.so &amp;&amp;
+cd /usr/lib &amp;&amp;
+ln -sf ../../lib/libshadow.so</userinput></screen></para>
 
 </sect2>
 

chapter06/shellutils-inst.xml

@@ -3,13 +3,13 @@
 
 <para>Install Shellutils by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-<userinput>make &amp;&amp;</userinput>
-<userinput>make install &amp;&amp;</userinput>
-<userinput>cd /usr/bin &amp;&amp;</userinput>
-<userinput>mv date echo false pwd stty /bin &amp;&amp;</userinput>
-<userinput>mv su true uname hostname /bin &amp;&amp;</userinput>
-<userinput>mv chroot ../sbin</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+cd /usr/bin &amp;&amp;
+mv date echo false pwd stty /bin &amp;&amp;
+mv su true uname hostname /bin &amp;&amp;
+mv chroot ../sbin</userinput></screen></para>
 
 </sect2>
 

chapter06/sysklogd-inst.xml

@@ -3,8 +3,8 @@
 
 <para>Install Sysklogd by running the following commands:</para>
 
-<para><screen><userinput>make &amp;&amp;</userinput>
-<userinput>make install</userinput></screen></para>
+<para><screen><userinput>make &amp;&amp;
+make install</userinput></screen></para>
 
 </sect2>
 

chapter06/sysvinit-inst.xml

@@ -11,15 +11,15 @@ change the init.c file so that the sentence reads "sending all
 processes started by init the TERM signal" by running the following
 commands. If you don't want to change it, skip it.</para>
 
-<para><screen><userinput>cp src/init.c src/init.c.backup &amp;&amp;</userinput>
-<userinput>sed 's/\(.*\)\(Sending processes\)\(.*\)/\1\2 started by init\3/' \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;src/init.c &gt; tmp~ &amp;&amp;</userinput>
-<userinput>mv tmp~ src/init.c</userinput></screen></para>
+<para><screen><userinput>cp src/init.c src/init.c.backup &amp;&amp;
+sed 's/\(.*\)\(Sending processes\)\(.*\)/\1\2 started by init\3/' \
+&nbsp;&nbsp;&nbsp;src/init.c &gt; tmp~ &amp;&amp;
+mv tmp~ src/init.c</userinput></screen></para>
 
 <para>Install Sysvinit by running the following commands:</para>
 
-<para><screen><userinput>make -C src &amp;&amp;</userinput>
-<userinput>make -C src install</userinput></screen></para>
+<para><screen><userinput>make -C src &amp;&amp;
+make -C src install</userinput></screen></para>
 
 </sect2>
 

chapter06/tar-inst.xml

@@ -14,10 +14,10 @@ for gzip files).</para>
 <para>Install Tar by running the following commands from the toplevel
 directory:</para>
 
-<para><screen><userinput>./configure --prefix=/usr --libexecdir=/usr/bin \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;--bindir=/bin &amp;&amp;</userinput>
-<userinput>make &amp;&amp;</userinput>
-<userinput>make install</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=/usr --libexecdir=/usr/bin \
+&nbsp;&nbsp;&nbsp;--bindir=/bin &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
 
 </sect2>
 

chapter06/texinfo-inst.xml

@@ -3,10 +3,10 @@
 
 <para>Install Texinfo by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-<userinput>make &amp;&amp;</userinput>
-<userinput>make install &amp;&amp;</userinput>
-<userinput>make TEXMF=/usr/share/texmf install-tex</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+make TEXMF=/usr/share/texmf install-tex</userinput></screen></para>
 
 </sect2>
 

chapter06/textutils-inst.xml

@@ -3,10 +3,10 @@
 
 <para>Install Textutils by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-<userinput>make &amp;&amp;</userinput>
-<userinput>make install &amp;&amp;</userinput>
-<userinput>mv /usr/bin/cat /bin</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+mv /usr/bin/cat /bin</userinput></screen></para>
 
 </sect2>
 

chapter06/utillinux-inst.xml

@@ -5,11 +5,11 @@
 adjtime file, instead of the usual /etc. To make hwclock, which is part of the
 util-linux package, FHS-compliant, run the following.</para>
 
-<para><screen><userinput>cp hwclock/hwclock.c hwclock/hwclock.c.backup &amp;&amp;</userinput>
-<userinput>sed 's%etc/adjtime%var/lib/hwclock/adjtime%' \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;hwclock/hwclock.c &gt; tmp~ &amp;&amp;</userinput>
-<userinput>mv tmp~ hwclock/hwclock.c &amp;&amp;</userinput>
-<userinput>mkdir -p /var/lib/hwclock</userinput></screen></para>
+<para><screen><userinput>cp hwclock/hwclock.c hwclock/hwclock.c.backup &amp;&amp;
+sed 's%etc/adjtime%var/lib/hwclock/adjtime%' \
+&nbsp;&nbsp;&nbsp;hwclock/hwclock.c &gt; tmp~ &amp;&amp;
+mv tmp~ hwclock/hwclock.c &amp;&amp;
+mkdir -p /var/lib/hwclock</userinput></screen></para>
 
 </sect2>
 
@@ -18,9 +18,9 @@ util-linux package, FHS-compliant, run the following.</para>
 
 <para>Install Util-Linux by running the following commands:</para>
 
-<para><screen><userinput>./configure &amp;&amp;</userinput>
-<userinput>make HAVE_SLN=yes ADD_RAW=yes &amp;&amp;</userinput>
-<userinput>make HAVE_SLN=yes ADD_RAW=yes install</userinput></screen></para>
+<para><screen><userinput>./configure &amp;&amp;
+make HAVE_SLN=yes ADD_RAW=yes &amp;&amp;
+make HAVE_SLN=yes ADD_RAW=yes install</userinput></screen></para>
 
 </sect2>
 

chapter06/vim-inst.xml

@@ -9,21 +9,21 @@ which are currently available are for Emacs, Joe and nano.</para>
 
 <para>Install Vim by running the following commands:</para>
 
-<para><screen><userinput>sed '/shUntil\|link shRepeat/{</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;/shUntil/N</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;/^/i\</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;if exists("b:is_kornshell") || exists("b:is_bash")</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;p</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;/$/i\</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;endif</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;d</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;}' runtime/syntax/sh.vim &gt; sh.vim.fixed &amp;&amp;</userinput>
-<userinput>mv sh.vim.fixed runtime/syntax/sh.vim &amp;&amp;</userinput>
-<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-<userinput>make CPPFLAGS=-DSYS_VIMRC_FILE=\\\"/etc/vimrc\\\" &amp;&amp;</userinput>
-<userinput>make install &amp;&amp;</userinput>
-<userinput>cd /usr/bin &amp;&amp;</userinput>
-<userinput>ln -sf vim vi</userinput></screen></para>
+<para><screen><userinput>sed '/shUntil\|link shRepeat/{
+&nbsp;&nbsp;&nbsp;/shUntil/N
+&nbsp;&nbsp;&nbsp;/^/i\
+&nbsp;&nbsp;&nbsp;if exists("b:is_kornshell") || exists("b:is_bash")
+&nbsp;&nbsp;&nbsp;p
+&nbsp;&nbsp;&nbsp;/$/i\
+&nbsp;&nbsp;&nbsp;endif
+&nbsp;&nbsp;&nbsp;d
+&nbsp;&nbsp;&nbsp;}' runtime/syntax/sh.vim &gt; sh.vim.fixed &amp;&amp;
+mv sh.vim.fixed runtime/syntax/sh.vim &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
+make CPPFLAGS=-DSYS_VIMRC_FILE=\\\"/etc/vimrc\\\" &amp;&amp;
+make install &amp;&amp;
+cd /usr/bin &amp;&amp;
+ln -sf vim vi</userinput></screen></para>
 
 <para>If you plan on installing the X Window system on your LFS
 system, you might want to re-compile Vim after you have installed X. Vim
@@ -41,24 +41,21 @@ for their temporary state files, like temporary save files for example.
 If you wish vim to conform to the FHS, you should use this command set 
 instead of the one presented above:</para>
 
-<para><screen><userinput>sed '/shUntil\|link shRepeat/{</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;/shUntil/N</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;/^/i\</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;if exists("b:is_kornshell") ||
-exists("b:is_bash")</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;p</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;/$/i\</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;endif</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;d</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;}' runtime/syntax/sh.vim &gt; sh.vim.fixed
-&amp;&amp;</userinput>
-<userinput>mv sh.vim.fixed runtime/syntax/sh.vim &amp;&amp;</userinput>
-<userinput>./configure --prefix=/usr --localstatedir=/var/lib/vim &amp;&amp;</userinput>
-<userinput>make CPPFLAGS=-DSYS_VIMRC_FILE=\\\"/etc/vimrc\\\"
-&amp;&amp;</userinput>
-<userinput>make install &amp;&amp;</userinput>
-<userinput>cd /usr/bin &amp;&amp;</userinput>
-<userinput>ln -sf vim vi</userinput></screen></para>
+<para><screen><userinput>sed '/shUntil\|link shRepeat/{
+&nbsp;&nbsp;&nbsp;/shUntil/N
+&nbsp;&nbsp;&nbsp;/^/i\
+&nbsp;&nbsp;&nbsp;if exists("b:is_kornshell") || exists("b:is_bash")
+&nbsp;&nbsp;&nbsp;p
+&nbsp;&nbsp;&nbsp;/$/i\
+&nbsp;&nbsp;&nbsp;endif
+&nbsp;&nbsp;&nbsp;d
+&nbsp;&nbsp;&nbsp;}' runtime/syntax/sh.vim &gt; sh.vim.fixed &amp;&amp;
+mv sh.vim.fixed runtime/syntax/sh.vim &amp;&amp;
+./configure --prefix=/usr --localstatedir=/var/lib/vim &amp;&amp;
+make CPPFLAGS=-DSYS_VIMRC_FILE=\\\"/etc/vimrc\\\" &amp;&amp;
+make install &amp;&amp;
+cd /usr/bin &amp;&amp;
+ln -sf vim vi</userinput></screen></para>
 
 </sect2>