Add missing colons wherever we expect the builder to key in the userinput.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8174 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
Ken Moffat 2007-06-24 13:03:35 +00:00
parent ea148539cb
commit f19e766a8e
14 changed files with 19 additions and 19 deletions

View File

@ -19,7 +19,7 @@
to be renamed so that it can be properly found and used. First, backup the to be renamed so that it can be properly found and used. First, backup the
original linker, then replace it with the adjusted linker. We'll also original linker, then replace it with the adjusted linker. We'll also
create a link to its counterpart in <filename class="directory"> create a link to its counterpart in <filename class="directory">
/tools/$(gcc -dumpmachine)/bin</filename></para> /tools/$(gcc -dumpmachine)/bin</filename>:</para>
<screen><userinput>mv -v /tools/bin/{ld,ld-old} <screen><userinput>mv -v /tools/bin/{ld,ld-old}
mv -v /tools/$(gcc -dumpmachine)/bin/{ld,ld-old} mv -v /tools/$(gcc -dumpmachine)/bin/{ld,ld-old}
@ -37,7 +37,7 @@ ln -sv /tools/bin/ld /tools/$(gcc -dumpmachine)/bin/ld</userinput></screen>
<para>For the sake of accuracy, it is recommended to use a copy-and-paste <para>For the sake of accuracy, it is recommended to use a copy-and-paste
method when issuing the following command. Be sure to visually inspect the method when issuing the following command. Be sure to visually inspect the
specs file and verify that all occurrences of <quote>/lib/ld-linux.so.2</quote> specs file and verify that all occurrences of <quote>/lib/ld-linux.so.2</quote>
have been replaced with <quote>/tools/lib/ld-linux.so.2</quote>.</para> have been replaced with <quote>/tools/lib/ld-linux.so.2</quote>:</para>
<important> <important>
<para>If working on a platform where the name of the dynamic linker is <para>If working on a platform where the name of the dynamic linker is

View File

@ -43,7 +43,7 @@
<para>Next, force Expect's configure script to use <filename>/bin/stty</filename> <para>Next, force Expect's configure script to use <filename>/bin/stty</filename>
instead of a <filename>/usr/local/bin/stty</filename> it may find on the host system. instead of a <filename>/usr/local/bin/stty</filename> it may find on the host system.
This will ensure that our testsuite tools remain sane for the final builds of our This will ensure that our testsuite tools remain sane for the final builds of our
toolchain.</para> toolchain:</para>
<screen><userinput>cp configure{,.bak} <screen><userinput>cp configure{,.bak}
sed 's:/usr/local/bin:/bin:' configure.bak &gt; configure</userinput></screen> sed 's:/usr/local/bin:/bin:' configure.bak &gt; configure</userinput></screen>

View File

@ -131,7 +131,7 @@ cd ../gcc-build</userinput></screen>
used to keep programs generic and therefore usable on all kinds of UNIX used to keep programs generic and therefore usable on all kinds of UNIX
systems where the GNU C compiler is not always installed. Running systems where the GNU C compiler is not always installed. Running
<command>cc</command> leaves the system administrator free to decide <command>cc</command> leaves the system administrator free to decide
which C compiler to install.</para> which C compiler to install:</para>
<screen><userinput>ln -vs gcc /tools/bin/cc</userinput></screen> <screen><userinput>ln -vs gcc /tools/bin/cc</userinput></screen>

View File

@ -78,7 +78,7 @@ sed 's@\./fixinc\.sh@-c true@' gcc/Makefile.in.orig &gt; gcc/Makefile.in</userin
built GCC with the <option>-fomit-frame-pointer</option> compiler flag. built GCC with the <option>-fomit-frame-pointer</option> compiler flag.
Non-bootstrap builds omit this flag by default, so apply the following Non-bootstrap builds omit this flag by default, so apply the following
<command>sed</command> to use it in order to ensure consistent compiler <command>sed</command> to use it in order to ensure consistent compiler
builds.</para> builds:</para>
<screen><userinput>cp -v gcc/Makefile.in{,.tmp} &amp;&amp; <screen><userinput>cp -v gcc/Makefile.in{,.tmp} &amp;&amp;
sed 's/^XCFLAGS =$/&amp; -fomit-frame-pointer/' gcc/Makefile.in.tmp \ sed 's/^XCFLAGS =$/&amp; -fomit-frame-pointer/' gcc/Makefile.in.tmp \

View File

@ -41,7 +41,7 @@
<para>The configure system causes bison to be built without support for <para>The configure system causes bison to be built without support for
internationalization of error messages if a <command>bison</command> internationalization of error messages if a <command>bison</command>
program is not already in $PATH. The following addition will correct program is not already in $PATH. The following addition will correct
this.</para> this:</para>
<screen><userinput>echo '#define YYENABLE_NLS 1' &gt;&gt; config.h</userinput></screen> <screen><userinput>echo '#define YYENABLE_NLS 1' &gt;&gt; config.h</userinput></screen>

View File

@ -37,7 +37,7 @@
<para>Some programs use hard-wired paths to programs which do not exist yet. In <para>Some programs use hard-wired paths to programs which do not exist yet. In
order to satisfy these programs, create a number of symbolic links which will be order to satisfy these programs, create a number of symbolic links which will be
replaced by real files throughout the course of this chapter after the software replaced by real files throughout the course of this chapter after the software
has been installed.</para> has been installed:</para>
<screen><userinput>ln -sv /tools/bin/{bash,cat,grep,pwd,stty} /bin <screen><userinput>ln -sv /tools/bin/{bash,cat,grep,pwd,stty} /bin
ln -sv /tools/bin/perl /usr/bin ln -sv /tools/bin/perl /usr/bin
@ -109,7 +109,7 @@ EOF</userinput></screen>
linkend="chapter-temporary-tools"/> and the linkend="chapter-temporary-tools"/> and the
<filename>/etc/passwd</filename> and <filename>/etc/group</filename> <filename>/etc/passwd</filename> and <filename>/etc/group</filename>
files have been created, user name and group name resolution will now files have been created, user name and group name resolution will now
work.</para> work:</para>
<screen role="nodump"><userinput>exec /tools/bin/bash --login +h</userinput></screen> <screen role="nodump"><userinput>exec /tools/bin/bash --login +h</userinput></screen>

View File

@ -46,7 +46,7 @@
built GCC with the <option>-fomit-frame-pointer</option> compiler flag. built GCC with the <option>-fomit-frame-pointer</option> compiler flag.
Non-bootstrap builds omit this flag by default, so apply the following Non-bootstrap builds omit this flag by default, so apply the following
<command>sed</command> to use it in order to ensure consistent compiler <command>sed</command> to use it in order to ensure consistent compiler
builds.</para> builds:</para>
<screen><userinput>sed -i 's/^XCFLAGS =$/&amp; -fomit-frame-pointer/' gcc/Makefile.in</userinput></screen> <screen><userinput>sed -i 's/^XCFLAGS =$/&amp; -fomit-frame-pointer/' gcc/Makefile.in</userinput></screen>
@ -62,7 +62,7 @@
compile time whether mktemp is present, and hardcodes the result in a test. compile time whether mktemp is present, and hardcodes the result in a test.
This will cause the script to fall back to using less random names for This will cause the script to fall back to using less random names for
temporary files. We will be installing mktemp later, so the following sed temporary files. We will be installing mktemp later, so the following sed
will simulate its presence.</para> will simulate its presence:</para>
<screen><userinput>sed -i 's/@have_mktemp_command@/yes/' gcc/gccbug.in</userinput></screen> <screen><userinput>sed -i 's/@have_mktemp_command@/yes/' gcc/gccbug.in</userinput></screen>

View File

@ -50,7 +50,7 @@
<screen><userinput>make install</userinput></screen> <screen><userinput>make install</userinput></screen>
<para>Move some programs that do not need to be on the root filesystem.</para> <para>Move some programs that do not need to be on the root filesystem:</para>
<screen><userinput>mv -v /bin/{gzexe,uncompress,zcmp,zdiff,zegrep} /usr/bin <screen><userinput>mv -v /bin/{gzexe,uncompress,zcmp,zdiff,zegrep} /usr/bin
mv -v /bin/{zfgrep,zforce,zgrep,zless,zmore,znew} /usr/bin</userinput></screen> mv -v /bin/{zfgrep,zforce,zgrep,zless,zmore,znew} /usr/bin</userinput></screen>

View File

@ -117,7 +117,7 @@ EOF</userinput></screen>
encoding when it displays them, so that they will display in both UTF-8 encoding when it displays them, so that they will display in both UTF-8
and traditional locales. Because this script is intended for limited use and traditional locales. Because this script is intended for limited use
during the system build, for public data, we will not bother with error during the system build, for public data, we will not bother with error
checking, nor use a non-predictable temporary file name.</para> checking, nor use a non-predictable temporary file name:</para>
<screen><userinput>cat &gt;&gt; convert-mans &lt;&lt; "EOF" <screen><userinput>cat &gt;&gt; convert-mans &lt;&lt; "EOF"
<literal>#!/bin/sh -e <literal>#!/bin/sh -e

View File

@ -36,7 +36,7 @@
<sect2 role="installation"> <sect2 role="installation">
<title>Installation of Patch</title> <title>Installation of Patch</title>
<para>Prepare Patch for compilation.</para> <para>Prepare Patch for compilation:</para>
<screen><userinput>./configure --prefix=/usr</userinput></screen> <screen><userinput>./configure --prefix=/usr</userinput></screen>

View File

@ -37,7 +37,7 @@
<para>First create a basic <filename>/etc/hosts</filename> file which will be <para>First create a basic <filename>/etc/hosts</filename> file which will be
referenced in one of Perl's configuration files as well as being used used by referenced in one of Perl's configuration files as well as being used used by
the testsuite if you run that.</para> the testsuite if you run that:</para>
<screen><userinput>echo "127.0.0.1 localhost $(hostname)" &gt; /etc/hosts</userinput></screen> <screen><userinput>echo "127.0.0.1 localhost $(hostname)" &gt; /etc/hosts</userinput></screen>

View File

@ -25,7 +25,7 @@
<para>First, backup the <filename class="directory">/tools</filename> linker, <para>First, backup the <filename class="directory">/tools</filename> linker,
and replace it with the adjusted linker we made in chapter 5. We'll also create and replace it with the adjusted linker we made in chapter 5. We'll also create
a link to its counterpart in <filename class="directory">/tools/$(gcc a link to its counterpart in <filename class="directory">/tools/$(gcc
-dumpmachine)/bin</filename>.</para> -dumpmachine)/bin</filename>:</para>
<screen><userinput>mv -v /tools/bin/{ld,ld-old} <screen><userinput>mv -v /tools/bin/{ld,ld-old}
mv -v /tools/$(gcc -dumpmachine)/bin/{ld,ld-old} mv -v /tools/$(gcc -dumpmachine)/bin/{ld,ld-old}
@ -35,7 +35,7 @@ ln -sv /tools/bin/ld /tools/$(gcc -dumpmachine)/bin/ld</userinput></screen>
<para>Next, amend the GCC specs file so that it points to the new <para>Next, amend the GCC specs file so that it points to the new
dynamic linker, and so that GCC knows where to find the correct headers dynamic linker, and so that GCC knows where to find the correct headers
and Glibc start files. A <command>sed</command> command accomplishes and Glibc start files. A <command>sed</command> command accomplishes
this.</para> this:</para>
<important> <important>
<para>If working on a platform where the name of the dynamic linker is <para>If working on a platform where the name of the dynamic linker is

View File

@ -81,7 +81,7 @@ find man -name Makefile -exec sed -i 's/groups\.1 / /' {} \;</userinput></screen
<para>Shadow supplies other manual pages in a UTF-8 encoding. Man-DB <para>Shadow supplies other manual pages in a UTF-8 encoding. Man-DB
can display these in the recommended encodings by using the can display these in the recommended encodings by using the
<command>convert-mans</command> script which we installed.</para> <command>convert-mans</command> script which we installed:</para>
<screen><userinput>for i in de es fi fr id it pt_BR; do <screen><userinput>for i in de es fi fr id it pt_BR; do
convert-mans UTF-8 ISO-8859-1 man/${i}/*.? convert-mans UTF-8 ISO-8859-1 man/${i}/*.?
@ -101,7 +101,7 @@ convert-mans UTF-8 ISO-8859-9 man/tr/*.?</userinput></screen>
passwords longer than 8 characters. It is also necessary to change the passwords longer than 8 characters. It is also necessary to change the
obsolete <filename class="directory">/var/spool/mail</filename> location obsolete <filename class="directory">/var/spool/mail</filename> location
for user mailboxes that Shadow uses by default to the <filename for user mailboxes that Shadow uses by default to the <filename
class="directory">/var/mail</filename> location used currently.</para> class="directory">/var/mail</filename> location used currently:</para>
<screen><userinput>sed -i -e 's@#MD5_CRYPT_ENAB.no@MD5_CRYPT_ENAB yes@' \ <screen><userinput>sed -i -e 's@#MD5_CRYPT_ENAB.no@MD5_CRYPT_ENAB yes@' \
-e 's@/var/spool/mail@/var/mail@' etc/login.defs</userinput></screen> -e 's@/var/spool/mail@/var/mail@' etc/login.defs</userinput></screen>

View File

@ -153,7 +153,7 @@ EOF</userinput></screen>
a framebuffer is used. If one wants to have bright colors without a framebuffer is used. If one wants to have bright colors without
framebuffer and can live without characters not belonging to his language, framebuffer and can live without characters not belonging to his language,
it is still possible to use a language-specific 256-glyph font, as it is still possible to use a language-specific 256-glyph font, as
illustrated below.</para> illustrated below:</para>
<screen role="nodump"><userinput>cat &gt; /etc/sysconfig/console &lt;&lt; "EOF" <screen role="nodump"><userinput>cat &gt; /etc/sysconfig/console &lt;&lt; "EOF"
<literal># Begin /etc/sysconfig/console <literal># Begin /etc/sysconfig/console