Author: dnicholson
Date: 2007-07-24 08:48:14 -0600 (Tue, 24 Jul 2007)
New Revision: 8235
Modified:
trunk/BOOK/chapter01/changelog.xml
trunk/BOOK/chapter05/adjusting.xml
trunk/BOOK/chapter05/gcc-pass2.xml
trunk/BOOK/chapter06/bash.xml
trunk/BOOK/chapter06/db.xml
trunk/BOOK/chapter06/man-db.xml
trunk/BOOK/chapter06/module-init-tools.xml
trunk/BOOK/chapter06/ncurses.xml
trunk/BOOK/chapter07/network.xml
trunk/BOOK/chapter08/grub.xml
trunk/BOOK/chapter08/kernel.xml
trunk/BOOK/general.ent
Log:
Remove extraneous && in chained commands
Modified: trunk/BOOK/chapter01/changelog.xml
===================================================================
--- trunk/BOOK/chapter01/changelog.xml 2007-07-24 14:02:03 UTC (rev 8234)
+++ trunk/BOOK/chapter01/changelog.xml 2007-07-24 14:48:14 UTC (rev 8235)
@@ -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>
Modified: trunk/BOOK/chapter05/adjusting.xml
===================================================================
--- trunk/BOOK/chapter05/adjusting.xml 2007-07-24 14:02:03 UTC (rev 8234)
+++ trunk/BOOK/chapter05/adjusting.xml 2007-07-24 14:48:14 UTC (rev 8235)
@@ -66,9 +66,9 @@
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>
Modified: trunk/BOOK/chapter05/gcc-pass2.xml
===================================================================
--- trunk/BOOK/chapter05/gcc-pass2.xml 2007-07-24 14:02:03 UTC (rev 8234)
+++ trunk/BOOK/chapter05/gcc-pass2.xml 2007-07-24 14:48:14 UTC (rev 8235)
@@ -71,7 +71,7 @@
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 '[EMAIL PROTECTED]/[EMAIL PROTECTED] 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 @@
<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>
Modified: trunk/BOOK/chapter06/bash.xml
===================================================================
--- trunk/BOOK/chapter06/bash.xml 2007-07-24 14:02:03 UTC (rev 8234)
+++ trunk/BOOK/chapter06/bash.xml 2007-07-24 14:48:14 UTC (rev 8235)
@@ -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>
Modified: trunk/BOOK/chapter06/db.xml
===================================================================
--- trunk/BOOK/chapter06/db.xml 2007-07-24 14:02:03 UTC (rev 8234)
+++ trunk/BOOK/chapter06/db.xml 2007-07-24 14:48:14 UTC (rev 8235)
@@ -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>
Modified: trunk/BOOK/chapter06/man-db.xml
===================================================================
--- trunk/BOOK/chapter06/man-db.xml 2007-07-24 14:02:03 UTC (rev 8234)
+++ trunk/BOOK/chapter06/man-db.xml 2007-07-24 14:48:14 UTC (rev 8235)
@@ -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 @@
(<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
Modified: trunk/BOOK/chapter06/module-init-tools.xml
===================================================================
--- trunk/BOOK/chapter06/module-init-tools.xml 2007-07-24 14:02:03 UTC (rev
8234)
+++ trunk/BOOK/chapter06/module-init-tools.xml 2007-07-24 14:48:14 UTC (rev
8235)
@@ -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>
Modified: trunk/BOOK/chapter06/ncurses.xml
===================================================================
--- trunk/BOOK/chapter06/ncurses.xml 2007-07-24 14:02:03 UTC (rev 8234)
+++ trunk/BOOK/chapter06/ncurses.xml 2007-07-24 14:48:14 UTC (rev 8235)
@@ -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 @@
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>
Modified: trunk/BOOK/chapter07/network.xml
===================================================================
--- trunk/BOOK/chapter07/network.xml 2007-07-24 14:02:03 UTC (rev 8234)
+++ trunk/BOOK/chapter07/network.xml 2007-07-24 14:48:14 UTC (rev 8235)
@@ -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
Modified: trunk/BOOK/chapter08/grub.xml
===================================================================
--- trunk/BOOK/chapter08/grub.xml 2007-07-24 14:02:03 UTC (rev 8234)
+++ trunk/BOOK/chapter08/grub.xml 2007-07-24 14:48:14 UTC (rev 8235)
@@ -134,7 +134,7 @@
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>
Modified: trunk/BOOK/chapter08/kernel.xml
===================================================================
--- trunk/BOOK/chapter08/kernel.xml 2007-07-24 14:02:03 UTC (rev 8234)
+++ trunk/BOOK/chapter08/kernel.xml 2007-07-24 14:48:14 UTC (rev 8235)
@@ -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
Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent 2007-07-24 14:02:03 UTC (rev 8234)
+++ trunk/BOOK/general.ent 2007-07-24 14:48:14 UTC (rev 8235)
@@ -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}]" -->
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
