diff options
| -rw-r--r-- | chapter01/changelog.xml | 10 | ||||
| -rw-r--r-- | chapter05/adjusting.xml | 6 | ||||
| -rw-r--r-- | chapter05/gcc-pass2.xml | 4 | ||||
| -rw-r--r-- | chapter06/bash.xml | 2 | ||||
| -rw-r--r-- | chapter06/db.xml | 2 | ||||
| -rw-r--r-- | chapter06/man-db.xml | 10 | ||||
| -rw-r--r-- | chapter06/module-init-tools.xml | 4 | ||||
| -rw-r--r-- | chapter06/ncurses.xml | 14 | ||||
| -rw-r--r-- | chapter07/network.xml | 4 | ||||
| -rw-r--r-- | chapter08/grub.xml | 2 | ||||
| -rw-r--r-- | chapter08/kernel.xml | 2 | ||||
| -rw-r--r-- | general.ent | 4 |
12 files changed, 37 insertions, 27 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 5b4d6e2ca..bb407f9a5 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -37,6 +37,16 @@ --> <listitem> + <para>2007-07-24</para> + <itemizedlist> + <listitem> + <para>[dnicholson] - Remove inconsistent uses of && from + the book.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>2007-07-23</para> <itemizedlist> <listitem> diff --git a/chapter05/adjusting.xml b/chapter05/adjusting.xml index bad013455..0d0c76e56 100644 --- a/chapter05/adjusting.xml +++ b/chapter05/adjusting.xml @@ -66,9 +66,9 @@ ln -sv /tools/bin/ld /tools/$(gcc -dumpmachine)/bin/ld</userinput></screen> their length):</para> <!-- && used to ease copy and pasting --> -<screen><userinput>GCC_INCLUDEDIR=`dirname $(gcc -print-libgcc-file-name)`/include && -find ${GCC_INCLUDEDIR}/* -maxdepth 0 -xtype d -exec rm -rvf '{}' \; && -rm -vf `grep -l "DO NOT EDIT THIS FILE" ${GCC_INCLUDEDIR}/*` && +<screen><userinput>GCC_INCLUDEDIR=`dirname $(gcc -print-libgcc-file-name)`/include +find ${GCC_INCLUDEDIR}/* -maxdepth 0 -xtype d -exec rm -rvf '{}' \; +rm -vf `grep -l "DO NOT EDIT THIS FILE" ${GCC_INCLUDEDIR}/*` unset GCC_INCLUDEDIR</userinput></screen> <caution> diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml index 92874a456..fa41bfcf2 100644 --- a/chapter05/gcc-pass2.xml +++ b/chapter05/gcc-pass2.xml @@ -71,7 +71,7 @@ Ask your system administrator to create more.</computeroutput></screen> directory. The running of the <command>fixincludes</command> script can be suppressed by issuing the following commands:</para> -<screen><userinput>cp -v gcc/Makefile.in{,.orig} && +<screen><userinput>cp -v gcc/Makefile.in{,.orig} sed 's@\./fixinc\.sh@-c true@' gcc/Makefile.in.orig > gcc/Makefile.in</userinput></screen> <para>The bootstrap build performed in <xref linkend="ch-tools-gcc-pass1"/> @@ -80,7 +80,7 @@ sed 's@\./fixinc\.sh@-c true@' gcc/Makefile.in.orig > gcc/Makefile.in</userin <command>sed</command> to use it in order to ensure consistent compiler builds:</para> -<screen><userinput>cp -v gcc/Makefile.in{,.tmp} && +<screen><userinput>cp -v gcc/Makefile.in{,.tmp} sed 's/^XCFLAGS =$/& -fomit-frame-pointer/' gcc/Makefile.in.tmp \ > gcc/Makefile.in</userinput></screen> diff --git a/chapter06/bash.xml b/chapter06/bash.xml index 14208e3c1..ba08418f3 100644 --- a/chapter06/bash.xml +++ b/chapter06/bash.xml @@ -37,7 +37,7 @@ <para>If you downloaded the Bash documentation tarball and wish to install HTML documentation, issue the following commands:</para> -<screen><userinput>tar -xvf ../bash-doc-&bash-doc-version;.tar.gz && +<screen><userinput>tar -xvf ../bash-doc-&bash-doc-version;.tar.gz sed -i "s|htmldir = @htmldir@|htmldir = /usr/share/doc/bash-&bash-version;|" \ Makefile.in</userinput></screen> diff --git a/chapter06/db.xml b/chapter06/db.xml index 93693ac5a..8ff19efb7 100644 --- a/chapter06/db.xml +++ b/chapter06/db.xml @@ -62,7 +62,7 @@ <para>Prepare Berkeley DB for compilation:</para> -<screen><userinput>cd build_unix && +<screen><userinput>cd build_unix ../dist/configure --prefix=/usr --enable-compat185 --enable-cxx</userinput></screen> <variablelist> diff --git a/chapter06/man-db.xml b/chapter06/man-db.xml index cc20e8bad..88ecef994 100644 --- a/chapter06/man-db.xml +++ b/chapter06/man-db.xml @@ -41,10 +41,10 @@ with Man-DB, in order for them to be accessible in both traditional and UTF-8 locales:</para> -<screen><userinput>mv man/de{_DE.88591,} && -mv man/es{_ES.88591,} && -mv man/it{_IT.88591,} && -mv man/ja{_JP.eucJP,} && +<screen><userinput>mv man/de{_DE.88591,} +mv man/es{_ES.88591,} +mv man/it{_IT.88591,} +mv man/ja{_JP.eucJP,} sed -i 's,\*_\*,??,' man/Makefile.in</userinput></screen> <para>The second change is a <command>sed</command> substitution to delete @@ -298,7 +298,7 @@ install -m755 convert-mans /usr/bin</userinput></screen> (<ulink url="http://ccb.club.fr/man/man-fr-1.58.0.tar.bz2"/>) can be installed with the following command:</para> -<screen role="nodump"><userinput>mkdir -p /usr/share/man/fr && +<screen role="nodump"><userinput>mkdir -p /usr/share/man/fr cp -rv man? /usr/share/man/fr</userinput></screen> <para>If upstream distributes manual pages in UTF-8 (i.e., <quote>for diff --git a/chapter06/module-init-tools.xml b/chapter06/module-init-tools.xml index 3dcc8bfa2..77228fcbb 100644 --- a/chapter06/module-init-tools.xml +++ b/chapter06/module-init-tools.xml @@ -44,8 +44,8 @@ <command>make distclean</command> command is required to clean up the source tree, as the source gets recompiled as part of the testing process):</para> -<screen><userinput>./configure && -make check && +<screen><userinput>./configure +make check make distclean</userinput></screen> <para>Prepare Module-Init-Tools for compilation:</para> diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml index 00d5de42c..a2092bdda 100644 --- a/chapter06/ncurses.xml +++ b/chapter06/ncurses.xml @@ -121,16 +121,16 @@ rm -vf /usr/lib/lib${lib}.so ; \ echo "INPUT(-l${lib}w)" >/usr/lib/lib${lib}.so ; \ ln -sfv lib${lib}w.a /usr/lib/lib${lib}.a ; \ -done && +done ln -sfv libncurses++w.a /usr/lib/libncurses++.a</userinput></screen> <para>Finally, make sure that old applications that look for <filename class="libraryfile">-lcurses</filename> at build time are still buildable:</para> -<screen><userinput>echo "INPUT(-lncursesw)" >/usr/lib/libcursesw.so && -ln -sfv libncurses.so /usr/lib/libcurses.so && -ln -sfv libncursesw.a /usr/lib/libcursesw.a && +<screen><userinput>echo "INPUT(-lncursesw)" >/usr/lib/libcursesw.so +ln -sfv libncurses.so /usr/lib/libcurses.so +ln -sfv libncursesw.a /usr/lib/libcursesw.a ln -sfv libncurses.a /usr/lib/libcurses.a</userinput></screen> <note> @@ -140,10 +140,10 @@ ln -sfv libncurses.a /usr/lib/libcurses.a</userinput></screen> of some binary-only application, build them with the following commands:</para> -<screen role="nodump"><userinput>make distclean && +<screen role="nodump"><userinput>make distclean ./configure --prefix=/usr --with-shared --without-normal \ - --without-debug --without-cxx-binding && -make sources libs && + --without-debug --without-cxx-binding +make sources libs cp -av lib/lib*.so.5* /usr/lib</userinput></screen> </note> diff --git a/chapter07/network.xml b/chapter07/network.xml index 7df7ae82e..dc4f05a8f 100644 --- a/chapter07/network.xml +++ b/chapter07/network.xml @@ -109,8 +109,8 @@ <para>The following command creates a sample <filename>ipv4</filename> file for the <emphasis>eth0</emphasis> device:</para> -<screen><userinput>cd /etc/sysconfig/network-devices && -mkdir -v ifconfig.eth0 && +<screen><userinput>cd /etc/sysconfig/network-devices +mkdir -v ifconfig.eth0 cat > ifconfig.eth0/ipv4 << "EOF" <literal>ONBOOT=yes SERVICE=ipv4-static diff --git a/chapter08/grub.xml b/chapter08/grub.xml index 8374c5719..913ed5f0c 100644 --- a/chapter08/grub.xml +++ b/chapter08/grub.xml @@ -134,7 +134,7 @@ EOF</userinput></screen> be symlinked to <filename class="symlink">/etc/grub/menu.lst</filename>. To satisfy this requirement, issue the following command:</para> -<screen><userinput>mkdir -v /etc/grub && +<screen><userinput>mkdir -v /etc/grub ln -sv /boot/grub/menu.lst /etc/grub</userinput></screen> </sect1> diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml index 1ba8dfc97..fb6216aef 100644 --- a/chapter08/kernel.xml +++ b/chapter08/kernel.xml @@ -129,7 +129,7 @@ <para>Install the documentation for the Linux kernel:</para> -<screen><userinput>install -d /usr/share/doc/linux-&linux-version; && +<screen><userinput>install -d /usr/share/doc/linux-&linux-version; cp -r Documentation/* /usr/share/doc/linux-&linux-version;</userinput></screen> <para>It is important to note that the files in the kernel source diff --git a/general.ent b/general.ent index c5c3f47d1..aced25c49 100644 --- a/general.ent +++ b/general.ent @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!ENTITY version "SVN-20070723"> -<!ENTITY releasedate "July 23, 2007"> +<!ENTITY version "SVN-20070724"> +<!ENTITY releasedate "July 24, 2007"> <!ENTITY milestone "6.3"> <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> |