Add whitespace for better readability of instructions

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

chapter05/binutils-pass1.xml

@@ -72,9 +72,10 @@ cd ../binutils-build</userinput></screen>
 
     <para>Now prepare Binutils for compilation:</para>
 
-<screen><userinput remap="configure">../binutils-&binutils-version;/configure \
+<screen><userinput remap="configure">../binutils-&binutils-version;/configure --target=$LFS_TGT \
-    --target=$LFS_TGT --prefix=/tools \
+                           --prefix=/tools   \
-    --disable-nls --disable-werror</userinput></screen>
+                           --disable-nls     \
+                           --disable-werror</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>

chapter05/binutils-pass2.xml

@@ -51,9 +51,12 @@ cd ../binutils-build</userinput></screen>
     <para>Prepare Binutils for compilation:</para>
 
 <screen><userinput remap="configure">CC="$LFS_TGT-gcc -B/tools/lib/" \
-   AR=$LFS_TGT-ar RANLIB=$LFS_TGT-ranlib \
+AR=$LFS_TGT-ar                  \
-   ../binutils-&binutils-version;/configure --prefix=/tools \
+RANLIB=$LFS_TGT-ranlib          \
-   --disable-nls --with-lib-path=/tools/lib</userinput></screen>
+../binutils-&binutils-version;/configure      \
+        --prefix=/tools         \
+        --disable-nls           \
+        --with-lib-path=/tools/lib</userinput></screen>
 
     <variablelist>
       <title>The meaning of the new configure options:</title>

chapter05/gcc-pass1.xml

@@ -77,13 +77,22 @@ cd ../gcc-build</userinput></screen>
     <para>Prepare GCC for compilation:</para>
 
 <screen><userinput remap="configure">../gcc-&gcc-version;/configure         \
-    --target=$LFS_TGT --prefix=/tools \
+    --target=$LFS_TGT          \
-    --disable-nls --disable-shared --disable-multilib \
+    --prefix=/tools            \
-    --disable-decimal-float --disable-threads \
+    --disable-nls              \
-    --disable-libmudflap --disable-libssp \
+    --disable-shared           \
-    --disable-libgomp --disable-libquadmath \
+    --disable-multilib         \
-    --disable-target-libiberty --disable-target-zlib \
+    --disable-decimal-float    \
-    --enable-languages=c --without-ppl --without-cloog \
+    --disable-threads          \
+    --disable-libmudflap       \
+    --disable-libssp           \
+    --disable-libgomp          \
+    --disable-libquadmath      \
+    --disable-target-libiberty \
+    --disable-target-zlib      \
+    --enable-languages=c       \
+    --without-ppl              \
+    --without-cloog            \
     --with-mpfr-include=$(pwd)/../gcc-&gcc-version;/mpfr/src \
     --with-mpfr-lib=$(pwd)/mpfr/src/.libs</userinput></screen>
 
@@ -159,8 +168,7 @@ cd ../gcc-build</userinput></screen>
     since that file will end up containing the objects normally contained in
     <filename>libgcc_eh.a</filename>:</para>
 
-<screen><userinput remap="install">ln -vs libgcc.a `$LFS_TGT-gcc -print-libgcc-file-name | \
+<screen><userinput remap="install">ln -vs libgcc.a `$LFS_TGT-gcc -print-libgcc-file-name | sed 's/libgcc/&amp;_eh/'`</userinput></screen>
-    sed 's/libgcc/&amp;_eh/'`</userinput></screen>
 
   </sect2>
 

chapter05/gcc-pass2.xml

@@ -150,14 +150,22 @@ cd ../gcc-build</userinput></screen>
     <para>Now prepare GCC for compilation:</para>
 
 <screen><userinput remap="configure">CC="$LFS_TGT-gcc -B/tools/lib/" \
-    AR=$LFS_TGT-ar RANLIB=$LFS_TGT-ranlib \
+AR=$LFS_TGT-ar                  \
-    ../gcc-&gcc-version;/configure --prefix=/tools \
+RANLIB=$LFS_TGT-ranlib          \
-    --with-local-prefix=/tools --enable-clocale=gnu \
+../gcc-&gcc-version;/configure          \
-    --enable-shared --enable-threads=posix \
+    --prefix=/tools             \
-    --enable-__cxa_atexit --enable-languages=c,c++ \
+    --with-local-prefix=/tools  \
-    --disable-libstdcxx-pch --disable-multilib \
+    --enable-clocale=gnu        \
-    --disable-bootstrap --disable-libgomp \
+    --enable-shared             \
-    --without-ppl --without-cloog \
+    --enable-threads=posix      \
+    --enable-__cxa_atexit       \
+    --enable-languages=c,c++    \
+    --disable-libstdcxx-pch     \
+    --disable-multilib          \
+    --disable-bootstrap         \
+    --disable-libgomp           \
+    --without-ppl               \
+    --without-cloog             \
     --with-mpfr-include=$(pwd)/../gcc-&gcc-version;/mpfr/src \
     --with-mpfr-lib=$(pwd)/mpfr/src/.libs</userinput></screen>
 

chapter05/glibc.xml

@@ -74,11 +74,16 @@ esac</userinput></screen>
 
     <para>Next, prepare Glibc for compilation:</para>
 
-<screen><userinput remap="configure">../glibc-&glibc-version;/configure --prefix=/tools \
+<screen><userinput remap="configure">../glibc-&glibc-version;/configure                             \
-    --host=$LFS_TGT --build=$(../glibc-&glibc-version;/scripts/config.guess) \
+      --prefix=/tools                                 \
-    --disable-profile --enable-add-ons \
+      --host=$LFS_TGT                                 \
-    --enable-kernel=2.6.25 --with-headers=/tools/include \
+      --build=$(../glibc-&glibc-version;/scripts/config.guess) \
-    libc_cv_forced_unwind=yes libc_cv_c_cleanup=yes</userinput></screen>
+      --disable-profile                               \
+      --enable-add-ons                                \
+      --enable-kernel=2.6.25                          \
+      --with-headers=/tools/include                   \
+      libc_cv_forced_unwind=yes                       \
+      libc_cv_c_cleanup=yes</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>

chapter05/grep.xml

@@ -45,8 +45,7 @@
 
     <para>Prepare Grep for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/tools \
+<screen><userinput remap="configure">./configure --prefix=/tools --disable-perl-regexp</userinput></screen>
-    --disable-perl-regexp</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure switches:</title>

chapter06/bash.xml

@@ -47,8 +47,10 @@
 
     <para>Prepare Bash for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr --bindir=/bin \
+<screen><userinput remap="configure">./configure --prefix=/usr                     \
-    --htmldir=/usr/share/doc/bash-&bash-version; --without-bash-malloc \
+            --bindir=/bin                     \
+            --htmldir=/usr/share/doc/bash-&bash-version; \
+            --without-bash-malloc             \
             --with-installed-readline</userinput></screen>
 
     <variablelist>

chapter06/chroot.xml

@@ -16,7 +16,9 @@
   realm that is, at the moment, populated with only the temporary tools:</para>
 
 <screen><userinput>chroot "$LFS" /tools/bin/env -i \
-    HOME=/root TERM="$TERM" PS1='\u:\w\$ ' \
+    HOME=/root                  \
+    TERM="$TERM"                \
+    PS1='\u:\w\$ '              \
     PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin \
     /tools/bin/bash --login +h</userinput></screen>
 

chapter06/e2fsprogs.xml

@@ -52,10 +52,15 @@ cd build</userinput></screen>
 
     <para>Prepare E2fsprogs for compilation:</para>
 
-<screen><userinput remap="configure">PKG_CONFIG=/tools/bin/true LDFLAGS="-lblkid -luuid" \
+<screen><userinput remap="configure">PKG_CONFIG=/tools/bin/true         \
-    ../configure --prefix=/usr --with-root-prefix="" \
+LDFLAGS="-lblkid -luuid"           \
-    --enable-elf-shlibs --disable-libblkid --disable-libuuid \
+../configure --prefix=/usr         \
-    --disable-uuidd --disable-fsck</userinput></screen>
+             --with-root-prefix="" \
+             --enable-elf-shlibs   \
+             --disable-libblkid    \
+             --disable-libuuid     \
+             --disable-uuidd       \
+             --disable-fsck</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
@@ -139,16 +144,14 @@ cd build</userinput></screen>
     commands.</para>
 
 <screen><userinput remap="install">gunzip -v /usr/share/info/libext2fs.info.gz
-install-info --dir-file=/usr/share/info/dir \
+install-info --dir-file=/usr/share/info/dir /usr/share/info/libext2fs.info</userinput></screen>
-             /usr/share/info/libext2fs.info</userinput></screen>
 
     <para>If desired, create and install some additional documentation by
     issuing the following commands:</para>
 
 <screen><userinput remap="install">makeinfo -o      doc/com_err.info ../lib/et/com_err.texinfo
 install -v -m644 doc/com_err.info /usr/share/info
-install-info --dir-file=/usr/share/info/dir \
+install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userinput></screen>
-             /usr/share/info/com_err.info</userinput></screen>
   </sect2>
 
   <sect2 id="contents-e2fsprogs" role="content">

chapter06/findutils.xml

@@ -45,7 +45,8 @@
 
     <para>Prepare Findutils for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr --libexecdir=/usr/lib/findutils \
+<screen><userinput remap="configure">./configure --prefix=/usr                   \
+            --libexecdir=/usr/lib/findutils \
             --localstatedir=/var/lib/locate</userinput></screen>
 
     <variablelist>

chapter06/flex.xml

@@ -88,8 +88,7 @@ chmod -v 755 /usr/bin/lex</userinput></screen>
     file:</para>
 
 <screen><userinput remap="install">mkdir -v /usr/share/doc/flex-&flex-version;
-cp    -v doc/flex.pdf \
+cp    -v doc/flex.pdf /usr/share/doc/flex-&flex-version;</userinput></screen>
-         /usr/share/doc/flex-&flex-version;</userinput></screen>
 
   </sect2>
 

chapter06/gawk.xml

@@ -59,8 +59,7 @@
     <para>If desired, install the documentation:</para>
 
 <screen><userinput remap="install">mkdir -v /usr/share/doc/gawk-&gawk-version;
-cp    -v doc/{awkforai.txt,*.{eps,pdf,jpg}} \
+cp    -v doc/{awkforai.txt,*.{eps,pdf,jpg}} /usr/share/doc/gawk-&gawk-version;</userinput></screen>
-         /usr/share/doc/gawk-&gawk-version;</userinput></screen>
 
   </sect2>
 

chapter06/gcc.xml

@@ -54,8 +54,7 @@
     consistent compiler builds:</para> 
 
 <screen><userinput remap="pre">case `uname -m` in
-  i?86) sed -i 's/^T_CFLAGS =$/&amp; -fomit-frame-pointer/' \
+  i?86) sed -i 's/^T_CFLAGS =$/&amp; -fomit-frame-pointer/' gcc/Makefile.in ;;
-        gcc/Makefile.in ;;
 esac</userinput></screen>
 
     <para>The <command>fixincludes</command> script is known to occasionally
@@ -75,10 +74,15 @@ cd ../gcc-build</userinput></screen>
     <para>Prepare GCC for compilation:</para>
 
 <screen><userinput remap="configure">../gcc-&gcc-version;/configure --prefix=/usr            \
-    --libexecdir=/usr/lib --enable-shared \
+                       --libexecdir=/usr/lib    \
-    --enable-threads=posix --enable-__cxa_atexit \
+                       --enable-shared          \
-    --enable-clocale=gnu --enable-languages=c,c++ \
+                       --enable-threads=posix   \ 
-    --disable-multilib --disable-bootstrap --with-system-zlib</userinput></screen>
+                       --enable-__cxa_atexit    \
+                       --enable-clocale=gnu     \
+                       --enable-languages=c,c++ \
+                       --disable-multilib       \
+                       --disable-bootstrap      \
+                       --with-system-zlib</userinput></screen>
 
     <para>Note that for other languages, there are some prerequisites that
     are not available. See the BLFS Book for instructions on how to

chapter06/glibc.xml

@@ -130,9 +130,12 @@ esac</userinput></screen>
 
     <para>Prepare Glibc for compilation:</para>
 
-<screen><userinput remap="configure">../glibc-&glibc-version;/configure --prefix=/usr \
+<screen><userinput remap="configure">../glibc-&glibc-version;/configure  \
-    --disable-profile --enable-add-ons \
+    --prefix=/usr          \
-    --enable-kernel=2.6.25 --libexecdir=/usr/lib/glibc</userinput></screen>
+    --disable-profile      \
+    --enable-add-ons       \
+    --enable-kernel=2.6.25 \
+    --libexecdir=/usr/lib/glibc</userinput></screen>
 
     <variablelist>
       <title>The meaning of the new configure options:</title>

chapter06/inetutils.xml

@@ -40,9 +40,13 @@
   <sect2 role="installation">
     <title>Installation of Inetutils</title>
 
-<screen><userinput remap="configure">./configure --prefix=/usr --libexecdir=/usr/sbin \
+<screen><userinput remap="configure">./configure --prefix=/usr  \
-    --localstatedir=/var --disable-ifconfig \
+    --libexecdir=/usr/sbin \
-    --disable-logger --disable-syslogd --disable-whois \
+    --localstatedir=/var   \
+    --disable-ifconfig     \
+    --disable-logger       \
+    --disable-syslogd      \
+    --disable-whois        \
     --disable-servers</userinput></screen>
 
     <variablelist>

chapter06/iproute2.xml

@@ -87,7 +87,9 @@ rm man/man8/arpd.8</userinput></screen>
 
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make DESTDIR= MANDIR=/usr/share/man \
+<screen><userinput remap="install">
+make DESTDIR=              \
+     MANDIR=/usr/share/man \
      DOCDIR=/usr/share/doc/iproute2-&iproute2-version; install</userinput></screen>
 
   </sect2>

chapter06/kmod.xml

@@ -47,8 +47,12 @@
 liblzma_LIBS="-L/lib -llzma"    \
 zlib_CFLAGS="-I/usr/include"    \
 zlib_LIBS="-L/lib -lz"          \
-./configure --prefix=/usr --bindir=/bin --libdir=/lib --sysconfdir=/etc \
+./configure --prefix=/usr       \
-            --with-xz     --with-zlib</userinput></screen>
+            --bindir=/bin       \
+            --libdir=/lib       \
+            --sysconfdir=/etc   \
+            --with-xz           \
+            --with-zlib</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
@@ -77,9 +81,11 @@ zlib_LIBS="-L/lib -lz"          \
     </para>
 
 <screen><userinput remap="install">make pkgconfigdir=/usr/lib/pkgconfig install
+
 for target in depmod insmod modinfo modprobe rmmod; do
   ln -sv ../bin/kmod /sbin/$target
 done
+
 ln -sv kmod /bin/lsmod</userinput></screen>
 
   </sect2>

chapter06/libpipeline.xml

@@ -44,7 +44,8 @@
     <para>Prepare Libpipeline for compilation:</para>
 
 <screen><userinput remap="configure">./configure CHECK_CFLAGS=-I/tools/include     \
-    CHECK_LIBS="-L/tools/lib -lcheck" --prefix=/usr</userinput></screen>
+            CHECK_LIBS="-L/tools/lib -lcheck" \
+            --prefix=/usr</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>

chapter06/man-db.xml

@@ -44,12 +44,16 @@
     <para>Prepare Man-DB for compilation:</para>
 
 <screen><userinput remap="configure">PKG_CONFIG=/tools/bin/true                       \
-    libpipeline_CFLAGS='' \
+libpipeline_CFLAGS=''                            \
-    libpipeline_LIBS='-lpipeline' \
+libpipeline_LIBS='-lpipeline'                    \
-    ./configure --prefix=/usr --libexecdir=/usr/lib \
+./configure --prefix=/usr                        \
-    --docdir=/usr/share/doc/man-db-&man-db-version; --sysconfdir=/etc \
+            --libexecdir=/usr/lib                \
-    --disable-setuid --with-browser=/usr/bin/lynx \
+            --docdir=/usr/share/doc/man-db-&man-db-version; \
-    --with-vgrind=/usr/bin/vgrind --with-grap=/usr/bin/grap</userinput></screen>
+            --sysconfdir=/etc                    \
+            --disable-setuid                     \
+            --with-browser=/usr/bin/lynx         \
+            --with-vgrind=/usr/bin/vgrind        \
+            --with-grap=/usr/bin/grap</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>

chapter06/mpfr.xml

@@ -47,7 +47,8 @@
 
     <para>Prepare MPFR for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr --enable-thread-safe \
+<screen><userinput remap="configure">./configure  --prefix=/usr        \
+             --enable-thread-safe \
              --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
 
     <para>Compile the package:</para>

chapter06/sysvinit.xml

@@ -52,8 +52,7 @@
     <quote>Sending processes configured via /etc/inittab the TERM signal</quote>
     instead:</para>
 
-<screen><userinput remap="pre">sed -i 's@Sending processes@&amp; configured via /etc/inittab@g' \
+<screen><userinput remap="pre">sed -i 's@Sending processes@&amp; configured via /etc/inittab@g' src/init.c</userinput></screen>
-    src/init.c</userinput></screen>
 
     <para>Maintained versions of the <command>wall</command> and 
     <command>mountpoint</command> programs were

chapter06/tar.xml

@@ -42,8 +42,10 @@
 
     <para>Prepare Tar for compilation:</para>
 
-<screen><userinput remap="configure">FORCE_UNSAFE_CONFIGURE=1 ./configure --prefix=/usr \
+<screen><userinput remap="configure">FORCE_UNSAFE_CONFIGURE=1  \
-   --bindir=/bin --libexecdir=/usr/sbin</userinput></screen>
+./configure --prefix=/usr \
+            --bindir=/bin \
+            --libexecdir=/usr/sbin</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>

chapter06/util-linux.xml

@@ -49,8 +49,7 @@
     <command>hwclock</command> program FHS-compliant, run the
     following:</para>
 
-<screen><userinput remap="pre">sed -e 's@etc/adjtime@var/lib/hwclock/adjtime@g' \
+<screen><userinput remap="pre">sed -e 's@etc/adjtime@var/lib/hwclock/adjtime@g' -i $(grep -rl '/etc/adjtime' .)
-    -i $(grep -rl '/etc/adjtime' .)
 mkdir -pv /var/lib/hwclock</userinput></screen>
 
   </sect2>