diff options
author | Dan Nichilson <dnicholson@linuxfromscratch.org> | 2007-07-24 14:48:14 +0000 |
---|---|---|
committer | Dan Nichilson <dnicholson@linuxfromscratch.org> | 2007-07-24 14:48:14 +0000 |
commit | ad83f72ad8ff3782a03c2bbd97cd746f908c9166 (patch) | |
tree | 95a73c8ca67a7e87a228078736659284ea1a3044 /chapter06 | |
parent | 0102f5359213fee5ec5f1acd70885328043dca19 (diff) |
Remove extraneous && in chained commands
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8235 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter06')
-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 |
5 files changed, 16 insertions, 16 deletions
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> |