diff options
| author | Manuel Canales Esparcia <manuel@linuxfromscratch.org> | 2007-09-18 21:39:40 +0000 |
|---|---|---|
| committer | Manuel Canales Esparcia <manuel@linuxfromscratch.org> | 2007-09-18 21:39:40 +0000 |
| commit | 282265483388160e795e8e220e3876adb60bac3d (patch) | |
| tree | be34ff249ab09c7e15e30634f2535ce296d56b6a | |
| parent | 6aa2db52064c43c4679ae9d405f5fdc2355eaba3 (diff) | |
Merged r8389:8391 from trunk.
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/jh/BOOK@8392 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
83 files changed, 530 insertions, 474 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 116f0c16d..c87ea9c3a 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -36,6 +36,18 @@ </listitem> --> + <listitem> + <para>2007-09-18</para> + <itemizedlist> + <listitem> + <para>[manuel] - Added remap attributes to userinput tags in packages + pages to help adding package manager support and other extensions + into jhalfs. Made all testsuite commands screen blocks for + consistency.</para> + </listitem> + </itemizedlist> + </listitem> + <listitem> <para>2007-09-16</para> <itemizedlist> diff --git a/chapter05/bash.xml b/chapter05/bash.xml index b1577517c..d55f01d0e 100644 --- a/chapter05/bash.xml +++ b/chapter05/bash.xml @@ -46,11 +46,11 @@ <para>Apply fixes for several bugs discovered since the initial release of Bash-&bash-version;:</para> -<screen><userinput>patch -Np1 -i ../&bash-fixes-patch;</userinput></screen> +<screen><userinput remap="pre">patch -Np1 -i ../&bash-fixes-patch;</userinput></screen> <para>Prepare Bash for compilation:</para> -<screen><userinput>./configure --prefix=/tools --without-bash-malloc</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/tools --without-bash-malloc</userinput></screen> <variablelist> <title>The meaning of the configure option:</title> @@ -70,19 +70,20 @@ <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make tests</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make tests</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> <para>Make a link for the programs that use <command>sh</command> for a shell:</para> -<screen><userinput>ln -vs bash /tools/bin/sh</userinput></screen> +<screen><userinput remap="install">ln -vs bash /tools/bin/sh</userinput></screen> </sect2> diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml index 1361e3150..f037c3641 100644 --- a/chapter05/binutils-pass1.xml +++ b/chapter05/binutils-pass1.xml @@ -51,7 +51,7 @@ <para>The Binutils documentation recommends building Binutils outside of the source directory in a dedicated build directory:</para> -<screen><userinput>mkdir -v ../binutils-build +<screen><userinput remap="pre">mkdir -v ../binutils-build cd ../binutils-build</userinput></screen> <note> @@ -65,7 +65,7 @@ cd ../binutils-build</userinput></screen> <para>Now prepare Binutils for compilation:</para> -<screen><userinput>CC="gcc -B/usr/bin/" ../binutils-&binutils-version;/configure \ +<screen><userinput remap="configure">CC="gcc -B/usr/bin/" ../binutils-&binutils-version;/configure \ --prefix=/tools --disable-nls --disable-werror</userinput></screen> <variablelist> @@ -111,7 +111,7 @@ cd ../binutils-build</userinput></screen> <para>Continue with compiling the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> <para>Compilation is now complete. Ordinarily we would now run the test suite, but at this early stage the test suite framework (Tcl, @@ -121,17 +121,17 @@ cd ../binutils-build</userinput></screen> <para>Create a symlink to ensure the sanity of our toolchain:</para> -<screen><userinput>mkdir -v /tools/lib +<screen><userinput remap="install">mkdir -v /tools/lib ln -sv lib /tools/lib64</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> <para>Finally, prepare the linker for the <quote>Adjusting</quote> phase later on:</para> -<screen><userinput>make -C ld clean +<screen><userinput remap="adjust">make -C ld clean make -C ld LIB_PATH=/tools/lib cp -v ld/ld-new /tools/bin</userinput></screen> diff --git a/chapter05/binutils-pass2.xml b/chapter05/binutils-pass2.xml index db4ebdd6b..d0c7a5ac5 100644 --- a/chapter05/binutils-pass2.xml +++ b/chapter05/binutils-pass2.xml @@ -45,12 +45,12 @@ <para>Create a separate build directory again:</para> -<screen><userinput>mkdir -v ../binutils-build +<screen><userinput remap="pre">mkdir -v ../binutils-build cd ../binutils-build</userinput></screen> <para>Prepare Binutils for compilation:</para> -<screen><userinput>../binutils-&binutils-version;/configure --prefix=/tools \ +<screen><userinput remap="configure">../binutils-&binutils-version;/configure --prefix=/tools \ --disable-nls --with-lib-path=/tools/lib</userinput></screen> <variablelist> @@ -71,27 +71,26 @@ cd ../binutils-build</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> <para>Compilation is now complete. As discussed earlier, running the test suite is not mandatory for the temporary tools here in this chapter. To run the Binutils test suite anyway, issue the following command:</para> -<screen><userinput>make check</userinput></screen> +<screen><userinput remap="test">make check</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> <para>Now prepare the linker for the <quote>Re-adjusting</quote> phase in the next chapter:</para> -<screen><userinput>make -C ld clean +<screen><userinput remap="adjust">make -C ld clean make -C ld LIB_PATH=/usr/lib:/lib cp -v ld/ld-new /tools/bin</userinput></screen> - </sect2> <sect2 role="content"> diff --git a/chapter05/bison.xml b/chapter05/bison.xml index 316f2ea80..0240cfbc0 100644 --- a/chapter05/bison.xml +++ b/chapter05/bison.xml @@ -45,18 +45,19 @@ <para>Prepare Bison for compilation:</para> -<screen><userinput>./configure --prefix=/tools</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make check</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter05/bzip2.xml b/chapter05/bzip2.xml index fe50bd4f9..cb53d7665 100644 --- a/chapter05/bzip2.xml +++ b/chapter05/bzip2.xml @@ -46,11 +46,11 @@ <para>The Bzip2 package does not contain a <command>configure</command> script. Compile and test it with:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> <para>Install the package:</para> -<screen><userinput>make PREFIX=/tools install</userinput></screen> +<screen><userinput remap="install">make PREFIX=/tools install</userinput></screen> </sect2> diff --git a/chapter05/coreutils.xml b/chapter05/coreutils.xml index e52e60d85..8a35596a7 100644 --- a/chapter05/coreutils.xml +++ b/chapter05/coreutils.xml @@ -47,29 +47,31 @@ by Coreutils is incompatible with the version that current Glibc provides, so we'll rename the function:</para> -<screen><userinput>for file in src/{copy,touch}.c lib/utimens.{c,h} ; do \ +<screen><userinput remap="pre">for file in src/{copy,touch}.c lib/utimens.{c,h} ; do \ cp -v $file{,.orig} sed 's/futimens/gl_&/' $file.orig > $file done</userinput></screen> <para>Prepare Coreutils for compilation:</para> -<screen><userinput>./configure --prefix=/tools</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make RUN_EXPENSIVE_TESTS=yes check</userinput>. The - <parameter>RUN_EXPENSIVE_TESTS=yes</parameter> parameter tells the + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make RUN_EXPENSIVE_TESTS=yes check</userinput></screen> + + <para>The <parameter>RUN_EXPENSIVE_TESTS=yes</parameter> parameter tells the test suite to run several additional tests that are considered relatively expensive (in terms of CPU power and memory usage) on some platforms, but generally are not a problem on Linux.</para> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> <para>The above command refuses to install <filename>su</filename> because it cannot install it setuid root as a non-privileged user. By @@ -78,7 +80,7 @@ done</userinput></screen> useful <command>su</command> from our host first place in our PATH. Install it with:</para> -<screen><userinput>cp -v src/su /tools/bin/su-tools</userinput></screen> +<screen><userinput remap="install">cp -v src/su /tools/bin/su-tools</userinput></screen> </sect2> diff --git a/chapter05/dejagnu.xml b/chapter05/dejagnu.xml index bf0ca3e8b..bae0ed7d9 100644 --- a/chapter05/dejagnu.xml +++ b/chapter05/dejagnu.xml @@ -43,14 +43,15 @@ <para>Prepare DejaGNU for compilation:</para> -<screen><userinput>./configure --prefix=/tools</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen> <para>Build and install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> - <para>To test the results, issue: - <userinput>make check</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> </sect2> diff --git a/chapter05/diffutils.xml b/chapter05/diffutils.xml index f2f3a2e61..cc76a3fd7 100644 --- a/chapter05/diffutils.xml +++ b/chapter05/diffutils.xml @@ -45,17 +45,17 @@ <para>Prepare Diffutils for compilation:</para> -<screen><userinput>./configure --prefix=/tools</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> <para>This package does not come with a test suite.</para> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter05/expect.xml b/chapter05/expect.xml index 53b732a46..6b486f138 100644 --- a/chapter05/expect.xml +++ b/chapter05/expect.xml @@ -44,19 +44,19 @@ <para>First, fix a bug that can result in false failures during the GCC test suite run:</para> -<screen><userinput>patch -Np1 -i ../&expect-spawn-patch;</userinput></screen> +<screen><userinput remap="pre">patch -Np1 -i ../&expect-spawn-patch;</userinput></screen> <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. This will ensure that our testsuite tools remain sane for the final builds of our toolchain:</para> -<screen><userinput>cp configure{,.bak} +<screen><userinput remap="pre">cp configure{,.bak} sed 's:/usr/local/bin:/bin:' configure.bak > configure</userinput></screen> <para>Now prepare Expect for compilation:</para> -<screen><userinput>./configure --prefix=/tools --with-tcl=/tools/lib \ +<screen><userinput remap="configure">./configure --prefix=/tools --with-tcl=/tools/lib \ --with-tclinclude=/tools/include --with-x=no</userinput></screen> <variablelist> @@ -95,17 +95,20 @@ sed 's:/usr/local/bin:/bin:' configure.bak > configure</userinput></screen> <para>Build the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: <userinput>make test</userinput>. - Note that the Expect test suite is known to experience failures under + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make test</userinput></screen> + + <para>Note that the Expect test suite is known to experience failures under certain host conditions that are not within our control. Therefore, test suite failures here are not surprising and are not considered critical.</para> <para>Install the package:</para> -<screen><userinput>make SCRIPTS="" install</userinput></screen> +<screen><userinput remap="install">make SCRIPTS="" install</userinput></screen> <variablelist> <title>The meaning of the make parameter:</title> diff --git a/chapter05/findutils.xml b/chapter05/findutils.xml index e761b141a..c809b121e 100644 --- a/chapter05/findutils.xml +++ b/chapter05/findutils.xml @@ -45,18 +45,19 @@ <para>Prepare Findutils for compilation:</para> -<screen><userinput>./configure --prefix=/tools</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make check</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter05/flex.xml b/chapter05/flex.xml index 2befdd9fe..4e9f20c78 100644 --- a/chapter05/flex.xml +++ b/chapter05/flex.xml @@ -45,18 +45,19 @@ <para>Prepare Flex for compilation:</para> -<screen><userinput>./configure --prefix=/tools</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make check</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter05/gawk.xml b/chapter05/gawk.xml index e54899b03..9a2ac64a3 100644 --- a/chapter05/gawk.xml +++ b/chapter05/gawk.xml @@ -45,28 +45,29 @@ <para>Prepare Gawk for compilation:</para> -<screen><userinput>./configure --prefix=/tools</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen> <para>Due to a bug in the <command>configure</command> script, Gawk fails to detect certain aspects of locale support in Glibc. This bug leads to, e.g., Gettext testsuite failures. Work around this issue by appending the missing macro definitions to <filename>config.h</filename>:</para> -<screen><userinput>cat >> config.h << "EOF" +<screen><userinput remap="configure">cat >> config.h << "EOF" <literal>#define HAVE_LANGINFO_CODESET 1 #define HAVE_LC_MESSAGES 1</literal> EOF</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make check</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml index 447d55fa8..cf3d9f14e 100644 --- a/chapter05/gcc-pass1.xml +++ b/chapter05/gcc-pass1.xml @@ -46,12 +46,12 @@ <para>The GCC documentation recommends building GCC outside of the source directory in a dedicated build directory:</para> -<screen><userinput>mkdir -v ../gcc-build +<screen><userinput remap="pre">mkdir -v ../gcc-build cd ../gcc-build</userinput></screen> <para>Prepare GCC for compilation:</para> -<screen><userinput>CC="gcc -B/usr/bin/" ../gcc-&gcc-version;/configure --prefix=/tools \ +<screen><userinput remap="configure">CC="gcc -B/usr/bin/" ../gcc-&gcc-version;/configure --prefix=/tools \ --with-local-prefix=/tools --disable-nls --disable-shared \ --enable-languages=c --disable-multilib</userinput></screen> @@ -112,7 +112,7 @@ cd ../gcc-build</userinput></screen> compiled correctly and is now the default configuration for the released package. Continue with compiling by running:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> <para>Compilation is now complete. At this point, the test suite would normally be run, but, as mentioned before, the test suite framework is @@ -122,7 +122,7 @@ cd ../gcc-build</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> <para>Using <command>--disable-shared</command> means that the file <filename class="libraryfile">libgcc_eh.a</filename> @@ -143,7 +143,7 @@ cd ../gcc-build</userinput></screen> <command>cc</command> leaves the system administrator free to decide which C compiler to install:</para> -<screen><userinput>ln -vs gcc /tools/bin/cc</userinput></screen> +<screen><userinput remap="install">ln -vs gcc /tools/bin/cc</userinput></screen> </sect2> diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml index 790487eb9..83f59578d 100644 --- a/chapter05/gcc-pass2.xml +++ b/chapter05/gcc-pass2.xml @@ -53,7 +53,7 @@ to see if the host system is set up correctly in this regard by performing a quick test:</para> -<screen><userinput>expect -c "spawn ls"</userinput></screen> +<screen><userinput remap="test">expect -c "spawn ls"</userinput></screen> <para>The response might be:</para> @@ -77,7 +77,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 remap="pre">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"/> @@ -86,7 +86,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 remap="pre">cp -v gcc/Makefile.in{,.tmp} sed 's/^XCFLAGS =$/& -fomit-frame-pointer/' gcc/Makefile.in.tmp \ > gcc/Makefile.in</userinput></screen> @@ -99,7 +99,7 @@ sed 's/^XCFLAGS =$/& -fomit-frame-pointer/' gcc/Makefile.in.tmp \ GCC. That is, all of the binaries created during the build will link against the new Glibc. Issue:</para> -<screen><userinput>for file in $(find gcc/config -name linux64.h -o -name linux.h) +<screen><userinput remap="pre">for file in $(find gcc/config -name linux64.h -o -name linux.h) do cp -uv $file{,.orig} sed -e 's@/lib\(64\)\?\(32\)\?/ld@/tools&@g' \ @@ -108,7 +108,7 @@ do #undef STANDARD_INCLUDE_DIR #define STANDARD_INCLUDE_DIR 0" >> $file touch $file.orig -done</userinput></screen> +done</userinput></screen> <para>In case the above seems hard to follow, let's break it down a bit. First we find all the files under the gcc/config directory that are named @@ -127,14 +127,14 @@ done</userinput></screen> <para>Unsetting the multlib spec for GCC ensures that it won't attempt to link against libraries on the host:</para> -<screen><userinput>for file in $(find gcc/config -name t-linux64) ; do \ +<screen><userinput remap="pre">for file in $(find gcc/config -name t-linux64) ; do \ cp -v $file{,.orig} sed '/MULTILIB_OSDIRNAMES/d' $file.orig > $file done</userinput></screen> <para>Create a separate build directory again:</para> -<screen><userinput>mkdir -v ../gcc-build +<screen><userinput remap="pre">mkdir -v ../gcc-build cd ../gcc-build</userinput></screen> <para>Before starting to build GCC, remember to unset any environment @@ -142,7 +142,7 @@ cd ../gcc-build</userinput></screen> <para>Now prepare GCC for compilation:</para> -<screen><userinput>../gcc-&gcc-version;/configure --prefix=/tools \ +<screen><userinput remap="configure">../gcc-&gcc-version;/configure --prefix=/tools \ --with-local-prefix=/tools --enable-clocale=gnu \ --enable-shared --enable-threads=posix \ --enable-__cxa_atexit --enable-languages=c,c++ \ @@ -215,7 +215,7 @@ cd ../gcc-build</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> <para>There is no need to use the <parameter>bootstrap</parameter> target now because the compiler being used to compile this GCC was built from @@ -225,7 +225,7 @@ cd ../gcc-build</userinput></screen> suites for the temporary tools compiled in this chapter is not mandatory. To run the GCC test suite anyway, use the following command:</para> -<screen><userinput>make -k check</userinput></screen> +<screen><userinput remap="test">make -k check</userinput></screen> <para>The <parameter>-k</parameter> flag is used to make the test suite run through to completion and not stop at the first failure. The GCC test @@ -237,7 +237,7 @@ cd ../gcc-build</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="adjusting.xml" diff --git a/chapter05/gettext.xml b/chapter05/gettext.xml index 8774df7e6..67ac3b0a7 100644 --- a/chapter05/gettext.xml +++ b/chapter05/gettext.xml @@ -48,7 +48,7 @@ <para>Prepare Gettext for compilation:</para> -<screen><userinput>cd gettext-tools +<screen><userinput remap="configure">cd gettext-tools ./configure --prefix=/tools --disable-shared</userinput></screen> <variablelist> @@ -66,7 +66,7 @@ <para>Compile the package:</para> -<screen><userinput>make -C gnulib-lib +<screen><userinput remap="make">make -C gnulib-lib make -C src msgfmt</userinput></screen> <para>As only one binary has been compiled, it is not possible to run the @@ -76,7 +76,7 @@ make -C src msgfmt</userinput></screen> <para>Install the <command>msgfmt</command> binary:</para> -<screen><userinput>cp -v src/msgfmt /tools/bin</userinput></screen> +<screen><userinput remap="install">cp -v src/msgfmt /tools/bin</userinput></screen> </sect2> diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml index 7f122a005..c6ef56b68 100644 --- a/chapter05/glibc.xml +++ b/chapter05/glibc.xml @@ -46,7 +46,7 @@ <para>The Glibc documentation recommends building Glibc outside of the source directory in a dedicated build directory:</para> -<screen><userinput>mkdir -v ../glibc-build +<screen><userinput remap="pre">mkdir -v ../glibc-build cd ../glibc-build</userinput></screen> <para>Because Glibc no longer supports i386, its developers say to use the @@ -57,12 +57,12 @@ cd ../glibc-build</userinput></screen> for CFLAGS, append the new flag to the existing contents of CFLAGS by making use of the special file <filename>configparms</filename>:</para> -<screen><userinput>uname -m | grep -q i?86 && +<screen><userinput remap="configure">uname -m | grep -q i?86 && echo "CFLAGS += -march=i486" > configparms</userinput></screen> <para>Next, prepare Glibc for compilation:</para> -<screen><userinput>../glibc-&glibc-version;/configure --prefix=/tools \ +<screen><userinput remap="configure">../glibc-&glibc-version;/configure --prefix=/tools \ --disable-profile --enable-add-ons \ --enable-kernel=2.6.0 --with-binutils=/tools/bin \ --without-gd --with-headers=/tools/include \ @@ -154,14 +154,14 @@ echo "CFLAGS += -march=i486" > configparms</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> <para>Compilation is now complete. As mentioned earlier, running the test suites for the temporary tools installed in this chapter is not mandatory. To run the Glibc test suite (if desired), the following command will do so:</para> -<screen><userinput>make check</userinput></screen> +<screen><userinput remap="test">make check</userinput></screen> <para>For a discussion of test failures that are of particular importance, please see <xref linkend="ch-system-glibc" role="."/></para> @@ -185,12 +185,12 @@ echo "CFLAGS += -march=i486" > configparms</userinput></screen> end about the absence of <filename>/tools/etc/ld.so.conf</filename>. Prevent this warning with:</para> -<screen><userinput>mkdir -v /tools/etc +<screen><userinput remap="install">mkdir -v /tools/etc touch /tools/etc/ld.so.conf</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> <para>Different countries and cultures have varying conventions for how to communicate. These conventions range from the format for diff --git a/chapter05/grep.xml b/chapter05/grep.xml index 12afa0819..46e3b1c42 100644 --- a/chapter05/grep.xml +++ b/chapter05/grep.xml @@ -45,7 +45,7 @@ <para>Prepare Grep for compilation:</para> -<screen><userinput>./configure --prefix=/tools \ +<screen><userinput remap="configure">./configure --prefix=/tools \ --disable-perl-regexp</userinput></screen> <variablelist> @@ -65,14 +65,15 @@ <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make check</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter05/gzip.xml b/chapter05/gzip.xml index eb2c6a7c8..f8ce9d1a3 100644 --- a/chapter05/gzip.xml +++ b/chapter05/gzip.xml @@ -47,25 +47,26 @@ by Gzip is incompatible with the version that current Glibc provides, so we'll rename the function:</para> -<screen><userinput>for file in gzip.c lib/utimens.{c,h} ; do \ +<screen><userinput remap="pre">for file in gzip.c lib/utimens.{c,h} ; do \ cp -v $file{,.orig} sed 's/futimens/gl_&/' $file.orig > $file done</userinput></screen> <para>Prepare Gzip for compilation:</para> -<screen><userinput>./configure --prefix=/tools</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make check</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter05/linux-headers.xml b/chapter05/linux-headers.xml index e7889a5fb..63063b7d6 100644 --- a/chapter05/linux-headers.xml +++ b/chapter05/linux-headers.xml @@ -50,7 +50,7 @@ <para>Install the header files:</para> -<screen><userinput>make mrproper +<screen><userinput remap="install">make mrproper make headers_check make INSTALL_HDR_PATH=dest headers_install cp -rv dest/include/* /tools/include</userinput></screen> diff --git a/chapter05/m4.xml b/chapter05/m4.xml index 54ff93360..8e3181cbe 100644 --- a/chapter05/m4.xml +++ b/chapter05/m4.xml @@ -45,18 +45,19 @@ <para>Prepare M4 for compilation:</para> -<screen><userinput>./configure --prefix=/tools</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make check</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter05/make.xml b/chapter05/make.xml index e525789d6..052df7931 100644 --- a/chapter05/make.xml +++ b/chapter05/make.xml @@ -44,18 +44,19 @@ <para>Prepare Make for compilation:</para> -<screen><userinput>./configure --prefix=/tools</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make check</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter05/ncurses.xml b/chapter05/ncurses.xml index 18076761e..cb4cc2049 100644 --- a/chapter05/ncurses.xml +++ b/chapter05/ncurses.xml @@ -45,7 +45,7 @@ <para>Prepare Ncurses for compilation:</para> -<screen><userinput>./configure --prefix=/tools --with-shared \ +<screen><userinput remap="configure">./configure --prefix=/tools --with-shared \ --without-debug --without-ada --enable-overwrite</userinput></screen> <variablelist> @@ -75,13 +75,13 @@ <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> <para>This package does not come with a test suite.</para> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter05/patch.xml b/chapter05/patch.xml index f285dd7be..de1ee7544 100644 --- a/chapter05/patch.xml +++ b/chapter05/patch.xml @@ -45,17 +45,17 @@ <para>Prepare Patch for compilation:</para> -<screen><userinput>./configure --prefix=/tools</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> <para>This package does not come with a test suite.</para> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter05/perl.xml b/chapter05/perl.xml index 0885cbbec..ad27d07ce 100644 --- a/chapter05/perl.xml +++ b/chapter05/perl.xml @@ -46,18 +46,18 @@ <para>First adapt some hard-wired paths to the C library by applying the following patch:</para> -<screen><userinput>patch -Np1 -i ../&perl-libc-patch;</userinput></screen> +<screen><userinput remap="pre">patch -Np1 -i ../&perl-libc-patch;</userinput></screen> <para>Fix an incompatibility with gcc-&gcc-version;:</para> -<screen><userinput>mv -v makedepend.SH{,.orig} +<screen><userinput remap="pre">mv -v makedepend.SH{,.orig} sed 's/command /command[ -]/' makedepend.SH.orig > makedepend.SH</userinput></screen> <para>Prepare Perl for compilation (make sure to get the 'Data/Dumper Fcntl IO POSIX' part of the command correct—they are all letters):</para> -<screen><userinput>./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper Fcntl IO POSIX'</userinput></screen> +<screen><userinput remap="configure">./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper Fcntl IO POSIX'</userinput></screen> <variablelist> <title>The meaning of the configure options:</title> @@ -67,7 +67,7 @@ sed 's/command /command[ -]/' makedepend.SH.orig > makedepend.SH</userinput>< <listitem> <para>This tells Perl to build the minimum set of static extensions needed for installing and testing the Coreutils and Glibc packages in the - next chapter.</para> + next chapter.</para> </listitem> </varlistentry> @@ -76,7 +76,7 @@ sed 's/command /command[ -]/' makedepend.SH.orig > makedepend.SH</userinput>< <para>Only a few of the utilities contained in this package need to be built:</para> -<screen><userinput>make perl utilities</userinput></screen> +<screen><userinput remap="make">make perl utilities</userinput></screen> <para>Although Perl comes with a test suite, it is not recommended to run it at this point. Only part of Perl was built and running @@ -86,7 +86,7 @@ sed 's/command /command[ -]/' makedepend.SH.orig > makedepend.SH</userinput>< <para>Install these tools and their libraries:</para> -<screen><userinput>cp -v perl pod/pod2man /tools/bin +<screen><userinput remap="install">cp -v perl pod/pod2man /tools/bin mkdir -pv /tools/lib/perl5/&perl-version; cp -Rv lib/* /tools/lib/perl5/&perl-version;</userinput></screen> diff --git a/chapter05/sed.xml b/chapter05/sed.xml index 9dc8c37de..ed346ebdf 100644 --- a/chapter05/sed.xml +++ b/chapter05/sed.xml @@ -45,18 +45,19 @@ <para>Prepare Sed for compilation:</para> -<screen><userinput>./configure --prefix=/tools</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make check</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter05/tar.xml b/chapter05/tar.xml index b82bfde8e..566836f13 100644 --- a/chapter05/tar.xml +++ b/chapter05/tar.xml @@ -45,18 +45,19 @@ <para>Prepare Tar for compilation:</para> -<screen><userinput>./configure --prefix=/tools</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make check</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter05/tcl.xml b/chapter05/tcl.xml index 04380af6a..7393709b9 100644 --- a/chapter05/tcl.xml +++ b/chapter05/tcl.xml @@ -50,15 +50,18 @@ <para>Prepare Tcl for compilation:</para> -<screen><userinput>cd unix +<screen><userinput remap="configure">cd unix ./configure --prefix=/tools</userinput></screen> <para>Build the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: <userinput>TZ=UTC make test</userinput>. - The Tcl test suite is known to experience failures under certain host + <para>To test the results, issue:</para> + +<screen><userinput remap="test">TZ=UTC make test</userinput></screen> + + <para>The Tcl test suite is known to experience failures under certain host conditions that are not fully understood. Therefore, test suite failures here are not surprising, and are not considered critical. The <parameter>TZ=UTC</parameter> parameter sets the time zone to Coordinated @@ -69,16 +72,16 @@ <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> <para>Install Tcl's headers. The next package, Expect, requires them to build.</para> -<screen><userinput>make install-private-headers</userinput></screen> +<screen><userinput remap="install">make install-private-headers</userinput></screen> <para>Now make a necessary symbolic link:</para> -<screen><userinput>ln -sv tclsh8.4 /tools/bin/tclsh</userinput></screen> +<screen><userinput remap="install">ln -sv tclsh8.4 /tools/bin/tclsh</userinput></screen> </sect2> diff --git a/chapter05/texinfo.xml b/chapter05/texinfo.xml index b776ed741..cea7779e8 100644 --- a/chapter05/texinfo.xml +++ b/chapter05/texinfo.xml @@ -45,18 +45,19 @@ <para>Prepare Texinfo for compilation:</para> -<screen><userinput>./configure --prefix=/tools</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make check</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter05/util-linux.xml b/chapter05/util-linux.xml index 3fa300b3c..d3708733f 100644 --- a/chapter05/util-linux.xml +++ b/chapter05/util-linux.xml @@ -47,27 +47,27 @@ from the <filename class="directory">/tools</filename> directory by default. This is fixed by altering the configure script:</para> -<screen><userinput>sed -i 's@/usr/include@/tools/include@g' configure</userinput></screen> +<screen><userinput remap="pre">sed -i 's@/usr/include@/tools/include@g' configure</userinput></screen> <para>Prepare Util-linux for compilation:</para> -<screen><userinput>./configure</userinput></screen> +<screen><userinput remap="configure">./configure</userinput></screen> <para>Compile some support routines:</para> -<screen><userinput>make -C lib</userinput></screen> +<screen><userinput remap="make">make -C lib</userinput></screen> <para>Only a few of the utilities contained in this package need to be built:</para> -<screen><userinput>make -C mount mount umount +<screen><userinput remap="make">make -C mount mount umount make -C text-utils more</userinput></screen> <para>This package does not come with a test suite.</para> <para>Copy these programs to the temporary tools directory:</para> -<screen><userinput>cp -v mount/{,u}mount text-utils/more /tools/bin</userinput></screen> +<screen><userinput remap="install">cp -v mount/{,u}mount text-utils/more /tools/bin</userinput></screen> </sect2> diff --git a/chapter06/autoconf.xml b/chapter06/autoconf.xml index 2dbcc5787..e5e241501 100644 --- a/chapter06/autoconf.xml +++ b/chapter06/autoconf.xml @@ -43,21 +43,23 @@ <para>Prepare Autoconf for compilation:</para> -<screen><userinput>./configure --prefix=/usr</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make check</userinput>. - This takes a long time, about 3 SBUs. In addition, 6 tests are skipped - that use Automake. For full test coverage, Autoconf can be re-tested + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> + + <para>This takes a long time, about 3 SBUs. In addition, 6 tests are skipped + that use Automake. For full test coverage, Autoconf can be re-tested after Automake has been installed.</para> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter06/automake.xml b/chapter06/automake.xml index 4cf46c095..aeb683563 100644 --- a/chapter06/automake.xml +++ b/chapter06/automake.xml @@ -43,19 +43,21 @@ <para>Prepare Automake for compilation:</para> -<screen><userinput>./configure --prefix=/usr</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make check</userinput>. - This takes a long time, about 10 SBUs.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> + + <para>This takes a long time, about 10 SBUs.</para> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter06/bash.xml b/chapter06/bash.xml index 8d53a7755..668071223 100644 --- a/chapter06/bash.xml +++ b/chapter06/bash.xml @@ -43,18 +43,18 @@ <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 remap="pre">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> <para>Apply fixes for several bugs discovered since the initial release of Bash-&bash-version;:</para> -<screen><userinput>patch -Np1 -i ../&bash-fixes-patch;</userinput></screen> +<screen><userinput remap="pre">patch -Np1 -i ../&bash-fixes-patch;</userinput></screen> <para>Prepare Bash for compilation:</para> -<screen><userinput>./configure --prefix=/usr --bindir=/bin \ +<screen><userinput remap="configure">./configure --prefix=/usr --bindir=/bin \ --without-bash-malloc --with-installed-readline</userinput></screen> <variablelist> @@ -74,7 +74,7 @@ sed -i "s|htmldir = @htmldir@|htmldir = /usr/share/doc/bash-&bash-version;|" \ <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> <para>Skip down to <quote>Install the package</quote> if not running the test suite.</para> @@ -84,18 +84,18 @@ sed -i "s|htmldir = @htmldir@|htmldir = /usr/share/doc/bash-&bash-version;|" \ class="username">nobody</systemitem> user can read the standard input device and write to the sources tree:</para> -<screen><userinput>sed -i 's/LANG/LC_ALL/' tests/intl.tests +<screen><userinput remap="test">sed -i 's/LANG/LC_ALL/' tests/intl.tests sed -i 's@tests@& </dev/tty@' tests/run-test chown -Rv nobody ./</userinput></screen> <para>Now, run the tests as the <systemitem class="username">nobody</systemitem> user:</para> -<screen><userinput>su-tools nobody -s /bin/bash -c "make tests"</userinput></screen> +<screen><userinput remap="test">su-tools nobody -s /bin/bash -c "make tests"</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> <para>Run the newly compiled <command>bash</command> program (replacing the one that is currently being executed):</para> diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml index c046cd315..535fd506e 100644 --- a/chapter06/binutils.xml +++ b/chapter06/binutils.xml @@ -45,7 +45,7 @@ environment. Check that everything is set up correctly by performing a simple test:</para> -<screen><userinput>expect -c "spawn ls"</userinput></screen> +<screen><userinput remap="test">expect -c "spawn ls"</userinput></screen> <para>If the following message shows up, the chroot environment is not set up for proper PTY operation:</para> @@ -59,17 +59,17 @@ Ask your system administrator to create more.</computeroutput></screen> <para>The Binutils documentation recommends building Binutils outside of the source directory in a dedicated build directory:</para> -<screen><userinput>mkdir -v ../binutils-build +<screen><userinput remap="pre">mkdir -v ../binutils-build cd ../binutils-build</userinput></screen> <para>Prepare Binutils for compilation:</para> -<screen><userinput>../binutils-&binutils-version;/configure --prefix=/usr \ +<screen><userinput remap="configure">../binutils-&binutils-version;/configure --prefix=/usr \ --enable-shared</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make tooldir=/usr</userinput></screen> +<screen><userinput remap="make">make tooldir=/usr</userinput></screen> <variablelist> <title>The meaning of the make parameter:</title> @@ -100,16 +100,16 @@ cd ../binutils-build</userinput></screen> <para>Test the results:</para> -<screen><userinput>make check</userinput></screen> +<screen><userinput remap="test">make check</userinput></screen> <para>Install the package:</para> -<screen><userinput>make tooldir=/usr install</userinput></screen> +<screen><userinput remap="install">make tooldir=/usr install</userinput></screen> <para>Install the <filename class="headerfile">libiberty</filename> header file that is needed by some packages:</para> -<screen><userinput>cp -v ../binutils-&binutils-version;/include/libiberty.h /usr/include</userinput></screen> +<screen><userinput remap="install">cp -v ../binutils-&binutils-version;/include/libiberty.h /usr/include</userinput></screen> </sect2> diff --git a/chapter06/bison.xml b/chapter06/bison.xml index 9f3c94782..4bcaf2f3e 100644 --- a/chapter06/bison.xml +++ b/chapter06/bison.xml @@ -42,25 +42,26 @@ <para>Prepare Bison for compilation:</para> -<screen><userinput>./configure --prefix=/usr</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen> <para>The configure system causes bison to be built without support for internationalization of error messages if a <command>bison</command> program is not already in $PATH. The following addition will correct this:</para> -<screen><userinput>echo '#define YYENABLE_NLS 1' >> config.h</userinput></screen> +<screen><userinput remap="configure">echo '#define YYENABLE_NLS 1' >> config.h</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make check</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter06/bzip2.xml b/chapter06/bzip2.xml index 28ffd0f6b..8900da74c 100644 --- a/chapter06/bzip2.xml +++ b/chapter06/bzip2.xml @@ -45,11 +45,11 @@ <para>Apply a patch to install the documentation for this package:</para> -<screen><userinput>patch -Np1 -i ../&bzip2-docs-patch;</userinput></screen> +<screen><userinput remap="pre">patch -Np1 -i ../&bzip2-docs-patch;</userinput></screen> <para>Prepare Bzip2 for compilation with:</para> -<screen><userinput>make -f Makefile-libbz2_so +<screen><userinput remap="make">make -f Makefile-libbz2_so make clean</userinput></screen> <variablelist> @@ -70,17 +70,17 @@ make clean</userinput></screen> <para>Compile and test the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> <para>Install the programs:</para> -<screen><userinput>make PREFIX=/usr install</userinput></screen> +<screen><userinput remap="install">make PREFIX=/usr install</userinput></screen> <para>Install the shared <command>bzip2</command> binary into the <filename class="directory">/bin</filename> directory, make some necessary symbolic links, and clean up:</para> -<screen><userinput>cp -v bzip2-shared /bin/bzip2 +<screen><userinput remap="install">cp -v bzip2-shared /bin/bzip2 cp -av libbz2.so* /lib ln -sv ../../lib/libbz2.so.1.0 /usr/lib/libbz2.so rm -v /usr/bin/{bunzip2,bzcat,bzip2} diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml index 82693d20c..3d8288366 100644 --- a/chapter06/coreutils.xml +++ b/chapter06/coreutils.xml @@ -45,30 +45,30 @@ by Coreutils is incompatible with the version that current Glibc provides, so we'll rename the function:</para> -<screen><userinput>sed -i 's/futimens/gl_&/' src/{copy,touch}.c lib/utimens.{c,h}</userinput></screen> +<screen><userinput remap="pre">sed -i 's/futimens/gl_&/' src/{copy,touch}.c lib/utimens.{c,h}</userinput></screen> <para>A known issue with the <command>uname</command> program from this package is that the <parameter>-p</parameter> switch always returns <computeroutput>unknown</computeroutput>. The following patch fixes this behavior for Intel architectures:</para> -<screen><userinput>patch -Np1 -i ../&coreutils-uname-patch;</userinput></screen> +<screen><userinput remap="pre">patch -Np1 -i ../&coreutils-uname-patch;</userinput></screen> <para>Prevent Coreutils from installing binaries that will be installed by other packages later:</para> -<screen><userinput>patch -Np1 -i ../&coreutils-suppress-patch;</userinput></screen> +<screen><userinput remap="pre">patch -Np1 -i ../&coreutils-suppress-patch;</userinput></screen> <para>POSIX requires that programs from Coreutils recognize character boundaries correctly even in multibyte locales. The following patch fixes this non-compliance and other internationalization-related bugs:</para> -<screen><userinput>patch -Np1 -i ../&coreutils-i18n-patch;</userinput></screen> +<screen><userinput remap="pre">patch -Np1 -i ../&coreutils-i18n-patch;</userinput></screen> <para>In order for the tests added by this patch to pass, the permissions for the test file have to be changed:</para> -<screen><userinput>chmod +x tests/sort/sort-mb-tests</userinput></screen> +<screen><userinput remap="pre">chmod +x tests/sort/sort-mb-tests</userinput></screen> <note> <para>In the past, many bugs were found in this patch. When reporting new @@ -78,11 +78,11 @@ <para>Now prepare Coreutils for compilation:</para> -<screen><userinput>./configure --prefix=/usr</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> <para>Skip down to <quote>Install the package</quote> if not running the test suite.</para> @@ -90,7 +90,7 @@ <para>Now the test suite is ready to be run. First, run the tests that are meant to be run as user <systemitem class="username">root</systemitem>:</para> -<screen><userinput>make NON_ROOT_USERNAME=nobody check-root</userinput></screen> +<screen><userinput remap="test">make NON_ROOT_USERNAME=nobody check-root</userinput></screen> <para>We're going to run the remainder of the tests as the <systemitem class="username">nobody</systemitem> user. Certain tests, @@ -98,23 +98,23 @@ these tests are not skipped we'll add a temporary group and make the user <systemitem class="username">nobody</systemitem> a part of it:</para> -<screen><userinput>echo "dummy:x:1000:nobody" >> /etc/group</userinput></screen> +<screen><userinput remap="test">echo "dummy:x:1000:nobody" >> /etc/group</userinput></screen> <para>Now run the tests:</para> -<screen><userinput>su-tools nobody -s /bin/bash -c "make RUN_EXPENSIVE_TESTS=yes check"</userinput></screen> +<screen><userinput remap="test">su-tools nobody -s /bin/bash -c "make RUN_EXPENSIVE_TESTS=yes check"</userinput></screen> <para>Remove the temporary group:</para> -<screen><userinput>sed -i '/dummy/d' /etc/group</userinput></screen> +<screen><userinput remap="test">sed -i '/dummy/d' /etc/group</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> <para>Move programs to the locations specified by the FHS:</para> -<screen><userinput>mv -v /usr/bin/{cat,chgrp,chmod,chown,cp,date,dd,df,echo} /bin +<screen><userinput remap="install">mv -v /usr/bin/{cat,chgrp,chmod,chown,cp,date,dd,df,echo} /bin mv -v /usr/bin/{false,hostname,ln,ls,mkdir,mknod,mv,pwd,readlink,rm} /bin mv -v /usr/bin/{rmdir,stty,sync,true,uname} /bin mv -v /usr/bin/chroot /usr/sbin</userinput></screen> @@ -125,7 +125,7 @@ mv -v /usr/bin/chroot /usr/sbin</userinput></screen> may not be available during the early stages of booting, those binaries need to be on the root partition:</para> -<screen><userinput>mv -v /usr/bin/{head,sleep,nice} /bin</userinput></screen> +<screen><userinput remap="install">mv -v /usr/bin/{head,sleep,nice} /bin</userinput></screen> </sect2> diff --git a/chapter06/db.xml b/chapter06/db.xml index b1f12e379..dc87fb78c 100644 --- a/chapter06/db.xml +++ b/chapter06/db.xml @@ -63,7 +63,7 @@ <para>Prepare Berkeley DB for compilation:</para> -<screen><userinput>cd build_unix +<screen><userinput remap="configure">cd build_unix ../dist/configure --prefix=/usr --enable-compat185 --enable-cxx</userinput></screen> <variablelist> @@ -88,7 +88,7 @@ <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> <para>It is not possible to test the package meaningfully, because that would involve building TCL bindings. TCL bindings cannot be @@ -98,7 +98,7 @@ <para>Install the package:</para> -<screen><userinput>make docdir=/usr/share/doc/db-&db-version; install</userinput></screen> +<screen><userinput remap="install">make docdir=/usr/share/doc/db-&db-version; install</userinput></screen> <variablelist> <title>The meaning of the make parameter:</title> @@ -115,7 +115,7 @@ <para>Fix the ownership of the installed documentation:</para> -<screen><userinput>chown -Rv root:root /usr/share/doc/db-&db-version;</userinput></screen> +<screen><userinput remap="install">chown -Rv root:root /usr/share/doc/db-&db-version;</userinput></screen> </sect2> diff --git a/chapter06/diffutils.xml b/chapter06/diffutils.xml index 46e50b62c..4ad5ea535 100644 --- a/chapter06/diffutils.xml +++ b/chapter06/diffutils.xml @@ -45,7 +45,7 @@ characters according to the current locale. The following patch fixes the non-compliance issue:</para> -<screen><userinput>patch -Np1 -i ../&diffutils-i18n-patch;</userinput></screen> +<screen><userinput remap="pre">patch -Np1 -i ../&diffutils-i18n-patch;</userinput></screen> <para>The above patch will cause the Diffutils build system to attempt to rebuild the <filename>diff.1</filename> man page using the unavailable @@ -53,21 +53,21 @@ <command>diff</command>. We can avoid this by updating the timestamp on the file <filename>man/diff.1</filename>:</para> -<screen><userinput>touch man/diff.1</userinput></screen> +<screen><userinput remap="pre">touch man/diff.1</userinput></screen> <para>Prepare Diffutils for compilation:</para> -<screen><userinput>./configure --prefix=/usr</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> <para>This package does not come with a test suite.</para> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml index 6b9b1a4c1..7ff43ed47 100644 --- a/chapter06/e2fsprogs.xml +++ b/chapter06/e2fsprogs.xml @@ -46,17 +46,17 @@ <para>Fix a hardcoded path to <filename>/bin/rm</filename> in E2fsprogs' testsuite:</para> - <screen><userinput>sed -i -e 's@/bin/rm@/tools&@' lib/blkid/test_probe.in</userinput></screen> + <screen><userinput remap="pre">sed -i -e 's@/bin/rm@/tools&@' lib/blkid/test_probe.in</userinput></screen> <para>The E2fsprogs documentation recommends that the package be built in a subdirectory of the source tree: </para> -<screen><userinput>mkdir -v build +<screen><userinput remap="pre">mkdir -v build cd build</userinput></screen> <para>Prepare E2fsprogs for compilation:</para> -<screen><userinput>../configure --prefix=/usr --with-root-prefix="" \ +<screen><userinput remap="configure">../configure --prefix=/usr --with-root-prefix="" \ --enable-elf-shlibs</userinput></screen> <variablelist> @@ -88,10 +88,11 @@ cd build</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make check</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> <para>One of the E2fsprogs tests will attempt to allocate 256 MB of memory. If you do not have significantly more RAM than this, it @@ -102,11 +103,11 @@ cd build</userinput></screen> <para>Install the binaries, documentation, and shared libraries:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> <para>Install the static libraries and headers:</para> -<screen><userinput>make install-libs</userinput></screen> +<screen><userinput remap="install">make install-libs</userinput></screen> </sect2> diff --git a/chapter06/file.xml b/chapter06/file.xml index 2775e78a4..78181dc73 100644 --- a/chapter06/file.xml +++ b/chapter06/file.xml @@ -43,17 +43,17 @@ <para>Prepare File for compilation:</para> -<screen><userinput>./configure --prefix=/usr</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> <para>This package does not come with a test suite.</para> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter06/findutils.xml b/chapter06/findutils.xml index 547f213ed..197bddc41 100644 --- a/chapter06/findutils.xml +++ b/chapter06/findutils.xml @@ -45,7 +45,7 @@ <para>Prepare Findutils for compilation:</para> -<screen><userinput>./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> @@ -64,14 +64,15 @@ <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make check</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> <para>Some of the scripts in the LFS-Bootscripts package depend on <command>find</command>. As <filename class="directory">/usr</filename> @@ -79,7 +80,7 @@ needs to be on the root partition. The <command>updatedb</command> script also needs to be modified to correct an explicit path:</para> -<screen><userinput>mv -v /usr/bin/find /bin +<screen><userinput remap="install">mv -v /usr/bin/find /bin sed -i -e 's/find:=${BINDIR}/find:=\/bin/' /usr/bin/updatedb</userinput></screen> </sect2> diff --git a/chapter06/flex.xml b/chapter06/flex.xml index 5d047f95e..c5942ff18 100644 --- a/chapter06/flex.xml +++ b/chapter06/flex.xml @@ -43,25 +43,26 @@ <para>Prepare Flex for compilation:</para> -<screen><userinput>./configure --prefix=/usr</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make check</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> <para>There are some packages that expect to find the <filename class="libraryfile">lex</filename> library in <filename class="directory">/usr/lib</filename>. Create a symlink to account for this:</para> -<screen><userinput>ln -sv libfl.a /usr/lib/libl.a</userinput></screen> +<screen><userinput remap="install">ln -sv libfl.a /usr/lib/libl.a</userinput></screen> <para>A few programs do not know about <command>flex</command> yet and try to run its predecessor, <command>lex</command>. To support those @@ -69,7 +70,7 @@ calls <filename>flex</filename> in <command>lex</command> emulation mode:</para> -<screen><userinput>cat > /usr/bin/lex << "EOF" +<screen><userinput remap="install">cat > /usr/bin/lex << "EOF" <literal>#!/bin/sh # Begin /usr/bin/lex diff --git a/chapter06/gawk.xml b/chapter06/gawk.xml index 4af335791..898f66a29 100644 --- a/chapter06/gawk.xml +++ b/chapter06/gawk.xml @@ -44,32 +44,33 @@ chunk of memory that was not allocated. This bug is fixed by the following patch:</para> -<screen><userinput>patch -Np1 -i ../&gawk-segfault-patch;</userinput></screen> +<screen><userinput remap="pre">patch -Np1 -i ../&gawk-segfault-patch;</userinput></screen> <para>Prepare Gawk for compilation:</para> -<screen><userinput>./configure --prefix=/usr --libexecdir=/usr/lib</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/usr --libexecdir=/usr/lib</userinput></screen> <para>Due to a bug in the <command>configure</command> script, Gawk fails to detect certain aspects of locale support in Glibc. This bug leads to, e.g., Gettext testsuite failures. Work around this issue by appending the missing macro definitions to <filename>config.h</filename>:</para> -<screen><userinput>cat >> config.h << "EOF" +<screen><userinput remap="configure">cat >> config.h << "EOF" <literal>#define HAVE_LANGINFO_CODESET 1 #define HAVE_LC_MESSAGES 1</literal> EOF</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make check</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml index 3481e8fa7..9f783f8d1 100644 --- a/chapter06/gcc.xml +++ b/chapter06/gcc.xml @@ -46,7 +46,7 @@ version of <filename class="libraryfile">libiberty.a</filename> provided by Binutils will be used instead:</para> -<screen><userinput>sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in</userinput></screen> +<screen><userinput remap="pre">sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in</userinput></screen> <para>The bootstrap build performed in <xref linkend="ch-tools-gcc-pass1"/> built GCC with the <option>-fomit-frame-pointer</option> compiler flag. @@ -54,7 +54,7 @@ <command>sed</command> to use it in order to ensure consistent compiler builds:</para> -<screen><userinput>sed -i 's/^XCFLAGS =$/& -fomit-frame-pointer/' gcc/Makefile.in</userinput></screen> +<screen><userinput remap="pre">sed -i 's/^XCFLAGS =$/& -fomit-frame-pointer/' gcc/Makefile.in</userinput></screen> <para>The <command>fixincludes</command> script is known to occasionally erroneously attempt to "fix" the system headers installed so far. As @@ -62,7 +62,7 @@ to not require fixing, issue the following command to prevent the <command>fixincludes</command> script from running:</para> -<screen><userinput>sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in</userinput></screen> +<screen><userinput remap="pre">sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in</userinput></screen> <para>GCC provides a <command>gccbug</command> script which detects at compile time whether mktemp is present, and hardcodes the result in a test. @@ -70,17 +70,17 @@ temporary files. We will be installing mktemp later, so the following sed will simulate its presence:</para> -<screen><userinput>sed -i 's/@have_mktemp_command@/yes/' gcc/gccbug.in</userinput></screen> +<screen><userinput remap="pre">sed -i 's/@have_mktemp_command@/yes/' gcc/gccbug.in</userinput></screen> <para>The GCC documentation recommends building GCC outside of the source directory in a dedicated build directory:</para> -<screen><userinput>mkdir -v ../gcc-build +<screen><userinput remap="pre">mkdir -v ../gcc-build cd ../gcc-build</userinput></screen> <para>Prepare GCC for compilation:</para> -<screen><userinput>../gcc-&gcc-version;/configure --prefix=/usr \ +<screen><userinput remap="configure">../gcc-&gcc-version;/configure --prefix=/usr \ --libexecdir=/usr/lib --enable-shared \ --enable-threads=posix --enable-__cxa_atexit \ --enable-clocale=gnu --enable-languages=c,c++ \ @@ -88,7 +88,7 @@ cd ../gcc-build</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> <important> <para>In this section, the test suite for GCC is considered @@ -97,11 +97,11 @@ cd ../gcc-build</userinput></screen> <para>Test the results, but do not stop at errors:</para> -<screen><userinput>make -k check</userinput></screen> +<screen><userinput remap="test">make -k check</userinput></screen> <para>To receive a summary of the test suite results, run:</para> -<screen><userinput>../gcc-&gcc-version;/contrib/test_summary</userinput></screen> +<screen><userinput remap="test">../gcc-&gcc-version;/contrib/test_summary</userinput></screen> <para>For only the summaries, pipe the output through <userinput>grep -A7 Summ</userinput>.</para> @@ -119,18 +119,18 @@ cd ../gcc-build</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> <para>Some packages expect the C preprocessor to be installed in the <filename class="directory">/lib</filename> directory. To support those packages, create this symlink:</para> -<screen><userinput>ln -sv ../usr/bin/cpp /lib</userinput></screen> +<screen><userinput remap="install">ln -sv ../usr/bin/cpp /lib</userinput></screen> <para>Many packages use the name <command>cc</command> to call the C compiler. To satisfy those packages, create a symlink:</para> -<screen><userinput>ln -sv gcc /usr/bin/cc</userinput></screen> +<screen><userinput remap="install">ln -sv gcc /usr/bin/cc</userinput></screen> <para>Now that our final toolchain is in place, it is important to again ensure that compiling and linking will work as expected. We do this by performing diff --git a/chapter06/gettext.xml b/chapter06/gettext.xml index b1ffd3aa2..f88d523e3 100644 --- a/chapter06/gettext.xml +++ b/chapter06/gettext.xml @@ -45,19 +45,21 @@ <para>Prepare Gettext for compilation:</para> -<screen><userinput>./configure --prefix=/usr</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make check</userinput>. - This takes a very long time, around 5 SBUs.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> + + <para>This takes a very long time, around 5 SBUs.</para> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml index 1b13f895d..68449ae05 100644 --- a/chapter06/glibc.xml +++ b/chapter06/glibc.xml @@ -67,7 +67,7 @@ <ulink url="&blfs-root;view/svn/general/libidn.html"/>). Unpack the tarball from within the Glibc source directory:</para> -<screen><userinput>tar -xvf ../glibc-libidn-&glibc-version;.tar.gz +<screen><userinput remap="pre">tar -xvf ../glibc-libidn-&glibc-version;.tar.gz mv glibc-libidn-&glibc-version; libidn</userinput></screen> <para>In the vi_VN.TCVN locale, <command>bash</command> enters an infinite loop @@ -75,7 +75,7 @@ mv glibc-libidn-&glibc-version; libidn</userinput></screen> Glibc problem. Disable installation of this locale in order to avoid the problem:</para> -<screen><userinput>sed -i '/vi_VN.TCVN/d' localedata/SUPPORTED</userinput></screen> +<screen><userinput remap="pre">sed -i '/vi_VN.TCVN/d' localedata/SUPPORTED</userinput></screen> <para>When running <command>make install</command>, a script called <filename>test-installation.pl</filename> performs a small sanity test on @@ -84,7 +84,7 @@ mv glibc-libidn-&glibc-version; libidn</userinput></screen> test would be carried out against the wrong Glibc. We can force the script to check the Glibc we have just installed with the following:</para> -<screen><userinput>DL=$(readelf -l /bin/sh | grep interpreter | \ +<screen><userinput remap="pre">DL=$(readelf -l /bin/sh | grep interpreter | \ awk '{print $4}' | sed -e 's@/tools@@' -e 's@]$@@') sed -i "s|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=$DL -o|" \ scripts/test-installation.pl @@ -96,22 +96,22 @@ unset DL</userinput></screen> <ulink url="&blfs-root;view/svn/postlfs/shells.html">Shells</ulink> chapter of the BLFS book:</para> -<screen><userinput>sed -i 's|@BASH@|/bin/bash|' elf/ldd.bash.in</userinput></screen> +<screen><userinput remap="pre">sed -i 's|@BASH@|/bin/bash|' elf/ldd.bash.in</userinput></screen> <para>The Glibc documentation recommends building Glibc outside of the source directory in a dedicated build directory:</para> -<screen><userinput>mkdir -v ../glibc-build +<screen><userinput remap="pre">mkdir -v ../glibc-build cd ../glibc-build</userinput></screen> <para>Again, add the needed compiler flag to CFLAGS for x86 machines:</para> -<screen><userinput>uname -m | grep -q i?86 && +<screen><userinput remap="configure">uname -m | grep -q i?86 && echo "CFLAGS += -march=i486" > configparms</userinput></screen> <para>Prepare Glibc for compilation:</para> -<screen><userinput>../glibc-&glibc-version;/configure --prefix=/usr \ +<screen><userinput remap="configure">../glibc-&glibc-version;/configure --prefix=/usr \ --disable-profile --enable-add-ons \ --enable-kernel=2.6.0 --libexecdir=/usr/lib/glibc</userinput></screen> @@ -132,7 +132,7 @@ echo "CFLAGS += -march=i486" > configparms</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> <important> <para>In this section, the test suite for Glibc is considered critical. @@ -141,7 +141,7 @@ echo "CFLAGS += -march=i486" > configparms</userinput></screen> <para>Test the results:</para> -<screen><userinput>make -k check 2>&1 | tee glibc-check-log +<screen><userinput remap="test">make -k check 2>&1 | tee glibc-check-log grep Error glibc-check-log</userinput></screen> <para>You will probably see an expected (ignored) failure in the @@ -183,11 +183,11 @@ grep Error glibc-check-log</userinput></screen> complain about the absence of <filename>/etc/ld.so.conf</filename>. Prevent this warning with:</para> -<screen><userinput>touch /etc/ld.so.conf</userinput></screen> +<screen><userinput remap="install">touch /etc/ld.so.conf</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> <para>The locales that can make the system respond in a different language were not installed by the above command. None of the locales are required, @@ -205,7 +205,7 @@ grep Error glibc-check-log</userinput></screen> The following instructions will install the minimum set of locales necessary for the optimal coverage of tests:</para> -<screen role="nodump"><userinput>mkdir -pv /usr/lib/locale +<screen role="nodump"><userinput remap="locale-test">mkdir -pv /usr/lib/locale localedef -i de_DE -f ISO-8859-1 de_DE localedef -i de_DE@euro -f ISO-8859-15 de_DE@euro localedef -i en_HK -f ISO-8859-1 en_HK @@ -228,7 +228,7 @@ localedef -i ja_JP -f EUC-JP ja_JP</userinput></screen> (it includes every locale listed above and many more) at once with the following time-consuming command:</para> -<screen><userinput>make localedata/install-locales</userinput></screen> +<screen><userinput remap="locale-full">make localedata/install-locales</userinput></screen> <para>Then use the <command>localedef</command> command to create and install locales not listed in the diff --git a/chapter06/grep.xml b/chapter06/grep.xml index 30e47b51a..2111da256 100644 --- a/chapter06/grep.xml +++ b/chapter06/grep.xml @@ -43,27 +43,28 @@ <para>The current Grep package has many bugs, especially in the support of multibyte locales. RedHat fixed some of them with the following patch:</para> -<screen><userinput>patch -Np1 -i ../&grep-fixes-patch;</userinput></screen> +<screen><userinput remap="pre">patch -Np1 -i ../&grep-fixes-patch;</userinput></screen> <para>In order for the tests added by this patch to pass, the permissions for the test file have to be changed:</para> -<screen><userinput>chmod +x tests/fmbtest.sh</userinput></screen> +<screen><userinput remap="pre">chmod +x tests/fmbtest.sh</userinput></screen> <para>Prepare Grep for compilation:</para> -<screen><userinput>./configure --prefix=/usr --bindir=/bin</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/usr --bindir=/bin</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make check</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter06/groff.xml b/chapter06/groff.xml index 3f250ad1b..31843cb55 100644 --- a/chapter06/groff.xml +++ b/chapter06/groff.xml @@ -44,7 +44,7 @@ <para>Apply the patch that adds the <quote>ascii8</quote> and <quote>nippon</quote> devices to Groff:</para> -<screen><userinput>patch -Np1 -i ../&groff-debian-patch;</userinput></screen> +<screen><userinput remap="pre">patch -Np1 -i ../&groff-debian-patch;</userinput></screen> <note> <para>These devices are used by Man-DB when formatting non-English manual @@ -56,7 +56,7 @@ <para>Many screen fonts don't have Unicode single quotes and dashes in them. Tell Groff to use the ASCII equivalents instead:</para> -<screen><userinput>sed -i -e 's/2010/002D/' -e 's/2212/002D/' \ +<screen><userinput remap="pre">sed -i -e 's/2010/002D/' -e 's/2212/002D/' \ -e 's/2018/0060/' -e 's/2019/0027/' font/devutf8/R.proto</userinput></screen> <para>Groff expects the environment variable <envar>PAGE</envar> to @@ -69,22 +69,22 @@ <para>Prepare Groff for compilation:</para> -<screen><userinput>PAGE=<replaceable><paper_size></replaceable> ./configure --prefix=/usr --enable-multibyte</userinput></screen> +<screen><userinput remap="configure">PAGE=<replaceable><paper_size></replaceable> ./configure --prefix=/usr --enable-multibyte</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> <para>This package does not come with a test suite.</para> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> <para>Some documentation programs, such as <command>xman</command>, will not work properly without the following symlinks:</para> -<screen><userinput>ln -sv eqn /usr/bin/geqn +<screen><userinput remap="install">ln -sv eqn /usr/bin/geqn ln -sv tbl /usr/bin/gtbl</userinput></screen> </sect2> diff --git a/chapter06/grub.xml b/chapter06/grub.xml index cd3b0f341..f105eb981 100644 --- a/chapter06/grub.xml +++ b/chapter06/grub.xml @@ -51,22 +51,23 @@ detection, fix some GCC 4.x issues, and provide better SATA support for some disk controllers:</para> -<screen><userinput>patch -Np1 -i ../&grub-geometry-patch;</userinput></screen> +<screen><userinput remap="pre">patch -Np1 -i ../&grub-geometry-patch;</userinput></screen> <para>Prepare GRUB for compilation:</para> -<screen><userinput>./configure --prefix=/usr</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make check</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install +<screen><userinput remap="install">make install mkdir -v /boot/grub cp -v /usr/lib/grub/i386-pc/stage{1,2} /boot/grub</userinput></screen> diff --git a/chapter06/gzip.xml b/chapter06/gzip.xml index e4eb2c394..1640517c1 100644 --- a/chapter06/gzip.xml +++ b/chapter06/gzip.xml @@ -45,26 +45,27 @@ by Gzip is incompatible with the version that current Glibc provides, so we'll rename the function:</para> -<screen><userinput>sed -i 's/futimens/gl_&/' gzip.c lib/utimens.{c,h}</userinput></screen> +<screen><userinput remap="pre">sed -i 's/futimens/gl_&/' gzip.c lib/utimens.{c,h}</userinput></screen> <para>Prepare Gzip for compilation:</para> -<screen><userinput>./configure --prefix=/usr --bindir=/bin</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/usr --bindir=/bin</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make check</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> <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 remap="install">mv -v /bin/{gzexe,uncompress,zcmp,zdiff,zegrep} /usr/bin mv -v /bin/{zfgrep,zforce,zgrep,zless,zmore,znew} /usr/bin</userinput></screen> </sect2> diff --git a/chapter06/iana-etc.xml b/chapter06/iana-etc.xml index 7172be5d4..6adbb3759 100644 --- a/chapter06/iana-etc.xml +++ b/chapter06/iana-etc.xml @@ -45,13 +45,13 @@ correct formats for the <filename>/etc/protocols</filename> and <filename>/etc/services</filename> data files:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> <para>This package does not come with a test suite.</para> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml index ac1cb3b43..814c8eb0f 100644 --- a/chapter06/inetutils.xml +++ b/chapter06/inetutils.xml @@ -45,11 +45,11 @@ man pages anyway. The following patch will correct this situation:</para> -<screen><userinput>patch -Np1 -i ../&inetutils-man_pages-patch;</userinput></screen> +<screen><userinput remap="pre">patch -Np1 -i ../&inetutils-man_pages-patch;</userinput></screen> <para>Prepare Inetutils for compilation:</para> -<screen><userinput>./configure --prefix=/usr --libexecdir=/usr/sbin \ +<screen><userinput remap="configure">./configure --prefix=/usr --libexecdir=/usr/sbin \ --sysconfdir=/etc --localstatedir=/var \ --disable-ifconfig --disable-logger --disable-syslogd \ --disable-whois --disable-servers</userinput></screen> @@ -110,18 +110,18 @@ <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> <para>This package does not come with a test suite.</para> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> <para>Move the <command>ping</command> program to its FHS-compliant place:</para> -<screen><userinput>mv -v /usr/bin/ping /bin</userinput></screen> +<screen><userinput remap="install">mv -v /usr/bin/ping /bin</userinput></screen> </sect2> diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml index b2ed17e9e..872d8c38c 100644 --- a/chapter06/iproute2.xml +++ b/chapter06/iproute2.xml @@ -44,11 +44,11 @@ <para>The installation of two manual pages is broken and results in dangling symlinks. Fix this with the following command:</para> -<screen><userinput>sed -i -e '/tc-bfifo.8/d' -e '/tc-pfifo.8/s/pbfifo/bfifo/' Makefile</userinput></screen> +<screen><userinput remap="pre">sed -i -e '/tc-bfifo.8/d' -e '/tc-pfifo.8/s/pbfifo/bfifo/' Makefile</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make SBINDIR=/sbin</userinput></screen> +<screen><userinput remap="make">make SBINDIR=/sbin</userinput></screen> <variablelist> <title>The meaning of the make option:</title> @@ -69,7 +69,7 @@ <para>Install the package:</para> -<screen><userinput>make SBINDIR=/sbin install</userinput></screen> +<screen><userinput remap="install">make SBINDIR=/sbin install</userinput></screen> <para>The <command>arpd</command> binary links against the Berkeley DB libraries that reside in <filename class="directory">/usr</filename> and @@ -77,7 +77,7 @@ according to the FHS, it must be in <filename class="directory">/usr/sbin</filename>. Move it there:</para> - <screen><userinput>mv -v /sbin/arpd /usr/sbin</userinput></screen> + <screen><userinput remap="install">mv -v /sbin/arpd /usr/sbin</userinput></screen> </sect2> diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml index f1f7e3edc..ffe9de637 100644 --- a/chapter06/kbd.xml +++ b/chapter06/kbd.xml @@ -44,7 +44,7 @@ across the keymaps in the Kbd package. The following patch fixes this issue for i386 keymaps:</para> -<screen><userinput>patch -Np1 -i ../&kbd-backspace-patch;</userinput></screen> +<screen><userinput remap="pre">patch -Np1 -i ../&kbd-backspace-patch;</userinput></screen> <para>After patching, the Backspace key generates the character with code 127, and the Delete key generates a well-known escape sequence.</para> @@ -52,11 +52,11 @@ <para>Patch Kbd to fix a bug in <command>setfont</command> that is triggered when compiling with GCC-&gcc-version;:</para> -<screen><userinput>patch -Np1 -i ../&kbd-gcc4_fixes-patch;</userinput></screen> +<screen><userinput remap="pre">patch -Np1 -i ../&kbd-gcc4_fixes-patch;</userinput></screen> <para>Prepare Kbd for compilation:</para> -<screen><userinput>./configure --datadir=/lib/kbd</userinput></screen> +<screen><userinput remap="configure">./configure --datadir=/lib/kbd</userinput></screen> <variablelist> <title>The meaning of the configure options:</title> @@ -74,13 +74,13 @@ <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> <para>This package does not come with a test suite.</para> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> <note> <para>For some languages (e.g., Belarusian) the Kbd package doesn't @@ -95,10 +95,7 @@ may not be available during the early stages of booting, those binaries need to be on the root partition:</para> -<screen><userinput>mv -v /usr/bin/{kbd_mode,openvt,setfont} /bin</userinput></screen> - - - +<screen><userinput remap="install">mv -v /usr/bin/{kbd_mode,openvt,setfont} /bin</userinput></screen> </sect2> diff --git a/chapter06/less.xml b/chapter06/less.xml index 44a36fb28..087b2e6a3 100644 --- a/chapter06/less.xml +++ b/chapter06/less.xml @@ -42,7 +42,7 @@ <para>Prepare Less for compilation:</para> -<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/usr --sysconfdir=/etc</userinput></screen> <variablelist> <title>The meaning of the configure options:</title> @@ -60,13 +60,13 @@ <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> <para>This package does not come with a test suite.</para> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter06/libtool.xml b/chapter06/libtool.xml index c709ebd3d..cd659e1a2 100644 --- a/chapter06/libtool.xml +++ b/chapter06/libtool.xml @@ -44,18 +44,19 @@ <para>Prepare Libtool for compilation:</para> -<screen><userinput>./configure --prefix=/usr</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make check</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter06/linux-headers.xml b/chapter06/linux-headers.xml index 1eaea5690..b50b02398 100644 --- a/chapter06/linux-headers.xml +++ b/chapter06/linux-headers.xml @@ -51,11 +51,11 @@ class='directory'>/usr/include/scsi</filename>. The versions provided by Glibc will be used instead:</para> -<screen><userinput>sed -i '/scsi/d' include/Kbuild</userinput></screen> +<screen><userinput remap="pre">sed -i '/scsi/d' include/Kbuild</userinput></screen> <para>Install the header files:</para> -<screen><userinput>make mrproper +<screen><userinput remap="install">make mrproper make headers_check make INSTALL_HDR_PATH=dest headers_install cp -rv dest/include/* /usr/include</userinput></screen> diff --git a/chapter06/m4.xml b/chapter06/m4.xml index 971f9c539..c22282c1d 100644 --- a/chapter06/m4.xml +++ b/chapter06/m4.xml @@ -42,18 +42,19 @@ <para>Prepare M4 for compilation:</para> -<screen><userinput>./configure --prefix=/usr</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make check</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter06/make.xml b/chapter06/make.xml index c95abe9dd..791908683 100644 --- a/chapter06/make.xml +++ b/chapter06/make.xml @@ -42,18 +42,19 @@ <para>Prepare Make for compilation:</para> -<screen><userinput>./configure --prefix=/usr</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make check</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter06/man-db.xml b/chapter06/man-db.xml index bfeb04035..d72f23eb5 100644 --- a/chapter06/man-db.xml +++ b/chapter06/man-db.xml @@ -47,7 +47,7 @@ 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,} +<screen><userinput remap="pre">mv man/de{_DE.88591,} mv man/es{_ES.88591,} mv man/it{_IT.88591,} mv man/ja{_JP.eucJP,} @@ -58,12 +58,12 @@ sed -i 's,\*_\*,??,' man/Makefile.in</userinput></screen> the <filename>man_db.conf</filename> file to prevent redundant results when using programs such as <command>whatis</command>:</para> -<screen><userinput>sed -i -e '\%\t/usr/man%d' -e '\%\t/usr/local/man%d' src/man_db.conf.in</userinput></screen> +<screen><userinput remap="pre">sed -i -e '\%\t/usr/man%d' -e '\%\t/usr/local/man%d' src/man_db.conf.in</userinput></screen> <para>The third change accounts for programs that Man-DB should be able to find at runtime, but that haven't been installed yet:</para> -<screen><userinput>cat >> include/manconfig.h.in << "EOF" +<screen><userinput remap="pre">cat >> include/manconfig.h.in << "EOF" <literal>#define WEB_BROWSER "exec /usr/bin/lynx" #define COL "/usr/bin/col" #define VGRIND "/usr/bin/vgrind" @@ -82,11 +82,11 @@ EOF</userinput></screen> <para>Finally, patch the sources to fix output errors if the man page is prematurely aborted by pressing the 'q' key:</para> -<screen><userinput>patch -Np1 -i ../&man-db-fixes-patch;</userinput></screen> +<screen><userinput remap="pre">patch -Np1 -i ../&man-db-fixes-patch;</userinput></screen> <para>Prepare Man-DB for compilation:</para> -<screen><userinput>./configure --prefix=/usr --enable-mb-groff --disable-setuid</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/usr --enable-mb-groff --disable-setuid</userinput></screen> <variablelist> <title>The meaning of the configure options:</title> @@ -112,13 +112,13 @@ EOF</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> <para>This package does not come with a test suite.</para> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> <para>Some packages provide UTF-8 man pages which this version of <command>man</command> is unable to display. The following script will @@ -130,7 +130,7 @@ EOF</userinput></screen> during the system build, for public data, we will not bother with error checking, nor use a non-predictable temporary file name:</para> -<screen><userinput>cat >> convert-mans << "EOF" +<screen><userinput remap="install">cat >> convert-mans << "EOF" <literal>#!/bin/sh -e FROM="$1" TO="$2" diff --git a/chapter06/man-pages.xml b/chapter06/man-pages.xml index 3f6b98adf..9513306c6 100644 --- a/chapter06/man-pages.xml +++ b/chapter06/man-pages.xml @@ -42,7 +42,7 @@ <para>Install Man-pages by running:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter06/mktemp.xml b/chapter06/mktemp.xml index b670a7967..4a9aac7e4 100644 --- a/chapter06/mktemp.xml +++ b/chapter06/mktemp.xml @@ -46,11 +46,11 @@ to <command>mktemp</command>. Patch Mktemp to include a <command>tempfile</command> wrapper:</para> -<screen><userinput>patch -Np1 -i ../&mktemp-tempfile-patch;</userinput></screen> +<screen><userinput remap="pre">patch -Np1 -i ../&mktemp-tempfile-patch;</userinput></screen> <para>Prepare Mktemp for compilation:</para> -<screen><userinput>./configure --prefix=/usr --with-libc</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/usr --with-libc</userinput></screen> <variablelist> <title>The meaning of the configure options:</title> @@ -69,13 +69,13 @@ <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> <para>This package does not come with a test suite.</para> <para>Install the package:</para> -<screen><userinput>make install +<screen><userinput remap="install">make install make install-tempfile</userinput></screen> </sect2> diff --git a/chapter06/module-init-tools.xml b/chapter06/module-init-tools.xml index 4f3329ab7..0a36e2f64 100644 --- a/chapter06/module-init-tools.xml +++ b/chapter06/module-init-tools.xml @@ -44,27 +44,27 @@ <para>First correct a potential problem when modules are specified using regular expressions:</para> -<screen><userinput>patch -Np1 -i ../&module-init-modprobe-patch;</userinput></screen> +<screen><userinput remap="pre">patch -Np1 -i ../&module-init-modprobe-patch;</userinput></screen> <para>Issue the following commands to perform the tests (note that the <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 +<screen><userinput remap="test">./configure make check make distclean</userinput></screen> <para>Prepare Module-Init-Tools for compilation:</para> -<screen><userinput>./configure --prefix=/ --enable-zlib</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/ --enable-zlib</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> <para>Install the package:</para> -<screen><userinput>make INSTALL=install install</userinput></screen> +<screen><userinput remap="install">make INSTALL=install install</userinput></screen> <variablelist> <title>The meaning of the make parameter:</title> diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml index 2d261cf4c..8b99eb872 100644 --- a/chapter06/ncurses.xml +++ b/chapter06/ncurses.xml @@ -54,11 +54,11 @@ <para>Apply the following patch to fix a number of issues uncovered by the static code analysis tool, Coverity:</para> -<screen><userinput>patch -Np1 -i ../&ncurses-coverity-patch;</userinput></screen> +<screen><userinput remap="pre">patch -Np1 -i ../&ncurses-coverity-patch;</userinput></screen> <para>Prepare Ncurses for compilation:</para> -<screen><userinput>./configure --prefix=/usr --with-shared --without-debug --enable-widec</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/usr --with-shared --without-debug --enable-widec</userinput></screen> <variablelist> <title>The meaning of the configure option:</title> @@ -92,7 +92,7 @@ <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> <para>This package has a test suite, but it can only be run after the package has been installed. The tests reside in the @@ -102,28 +102,28 @@ <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> <para>Correct the permissions of a library that should not be executable: </para> -<screen><userinput>chmod -v 644 /usr/lib/libncurses++w.a</userinput></screen> +<screen><userinput remap="install">chmod -v 644 /usr/lib/libncurses++w.a</userinput></screen> <para>Move the libraries to the <filename class="directory">/lib</filename> directory, where they are expected to reside:</para> -<screen><userinput>mv -v /usr/lib/libncursesw.so.5* /lib</userinput></screen> +<screen><userinput remap="install">mv -v /usr/lib/libncursesw.so.5* /lib</userinput></screen> <para>Because the libraries have been moved, one symlink points to a non-existent file. Recreate it:</para> -<screen><userinput>ln -sfv ../../lib/libncursesw.so.5 /usr/lib/libncursesw.so</userinput></screen> +<screen><userinput remap="install">ln -sfv ../../lib/libncursesw.so.5 /usr/lib/libncursesw.so</userinput></screen> <para>Many applications still expect the linker to be able to find non-wide-character Ncurses libraries. Trick such applications into linking with wide-character libraries by means of symlinks and linker scripts:</para> -<screen><userinput>for lib in curses ncurses form panel menu ; do \ +<screen><userinput remap="install">for lib in curses ncurses form panel menu ; do \ 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 ; \ @@ -134,7 +134,7 @@ ln -sfv libncurses++w.a /usr/lib/libncurses++.a</userinput></screen> <filename class="libraryfile">-lcurses</filename> at build time are still buildable:</para> -<screen><userinput>rm -vf /usr/lib/libcursesw.so +<screen><userinput remap="install">rm -vf /usr/lib/libcursesw.so echo "INPUT(-lncursesw)" >/usr/lib/libcursesw.so ln -sfv libncurses.so /usr/lib/libcurses.so ln -sfv libncursesw.a /usr/lib/libcursesw.a diff --git a/chapter06/patch.xml b/chapter06/patch.xml index 2acdda2fe..3e08cf8c9 100644 --- a/chapter06/patch.xml +++ b/chapter06/patch.xml @@ -44,17 +44,17 @@ <para>Prepare Patch for compilation:</para> -<screen><userinput>./configure --prefix=/usr</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> <para>This package does not come with a test suite.</para> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter06/perl.xml b/chapter06/perl.xml index 77d027b89..10f5f2ce4 100644 --- a/chapter06/perl.xml +++ b/chapter06/perl.xml @@ -45,18 +45,18 @@ referenced in one of Perl's configuration files as well as the optional testsuite:</para> -<screen><userinput>echo "127.0.0.1 localhost $(hostname)" > /etc/hosts</userinput></screen> +<screen><userinput remap="pre">echo "127.0.0.1 localhost $(hostname)" > /etc/hosts</userinput></screen> <para>Fix an incompatibility with gcc-&gcc-version;:</para> -<screen><userinput>sed -i 's/command /command[ -]/' makedepend.SH</userinput></screen> +<screen><userinput remap="pre">sed -i 's/command /command[ -]/' makedepend.SH</userinput></screen> <para>To have full control over the way Perl is set up, you can run the interactive <command>Configure</command> script and hand-pick the way this package is built. If you prefer, you can use the defaults that Perl auto-detects, by preparing Perl for compilation with:</para> -<screen><userinput>./configure.gnu --prefix=/usr \ +<screen><userinput remap="configure">./configure.gnu --prefix=/usr \ -Dman1dir=/usr/share/man/man1 \ -Dman3dir=/usr/share/man/man3 \ -Dpager="/usr/bin/less -isR"</userinput></screen> @@ -86,14 +86,15 @@ <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make test</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make test</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter06/procps.xml b/chapter06/procps.xml index f5265bac6..c2329b2cb 100644 --- a/chapter06/procps.xml +++ b/chapter06/procps.xml @@ -42,13 +42,13 @@ <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> <para>This package does not come with a test suite.</para> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter06/psmisc.xml b/chapter06/psmisc.xml index 8368e3a7f..18d390a18 100644 --- a/chapter06/psmisc.xml +++ b/chapter06/psmisc.xml @@ -43,7 +43,7 @@ <para>Prepare Psmisc for compilation:</para> -<screen><userinput>./configure --prefix=/usr --exec-prefix=""</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/usr --exec-prefix=""</userinput></screen> <variablelist> <title>The meaning of the configure options:</title> @@ -63,20 +63,20 @@ <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> <para>This package does not come with a test suite.</para> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> <para>There is no reason for the <command>pstree</command> and <command>pstree.x11</command> programs to reside in <filename class="directory">/bin</filename>. Therefore, move them to <filename class="directory">/usr/bin</filename>:</para> -<screen><userinput>mv -v /bin/pstree* /usr/bin</userinput></screen> +<screen><userinput remap="install">mv -v /bin/pstree* /usr/bin</userinput></screen> <para>By default, Psmisc's <command>pidof</command> program is not installed. This usually is not a problem because it is installed later @@ -85,7 +85,7 @@ particular system, complete the installation of Psmisc by creating the following symlink:</para> -<screen><userinput>ln -sv killall /bin/pidof</userinput></screen> +<screen><userinput remap="install">ln -sv killall /bin/pidof</userinput></screen> </sect2> diff --git a/chapter06/readline.xml b/chapter06/readline.xml index 4ccc9e3e0..48174821b 100644 --- a/chapter06/readline.xml +++ b/chapter06/readline.xml @@ -46,7 +46,7 @@ it can trigger a linking bug in <command>ldconfig</command>. This can be avoided by issuing the following two seds:</para> -<screen><userinput>sed -i '/MV.*old/d' Makefile.in +<screen><userinput remap="pre">sed -i '/MV.*old/d' Makefile.in sed -i '/{OLDSUFF}/c:' support/shlib-install</userinput></screen> <para>Readline contains a bug in its handling of non-multibyte characters, @@ -54,15 +54,15 @@ sed -i '/{OLDSUFF}/c:' support/shlib-install</userinput></screen> Fix this issue by applying the following patch from the upstream maintainer: </para> -<screen><userinput>patch -Np1 -i ../&readline-fixes-patch;</userinput></screen> +<screen><userinput remap="pre">patch -Np1 -i ../&readline-fixes-patch;</userinput></screen> <para>Prepare Readline for compilation:</para> -<screen><userinput>./configure --prefix=/usr --libdir=/lib</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/usr --libdir=/lib</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make SHLIB_LIBS=-lncurses</userinput></screen> +<screen><userinput remap="make">make SHLIB_LIBS=-lncurses</userinput></screen> <variablelist> <title>The meaning of the make option:</title> @@ -82,17 +82,17 @@ sed -i '/{OLDSUFF}/c:' support/shlib-install</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> <para>Now move the static libraries to a more appropriate location:</para> -<screen><userinput>mv -v /lib/lib{readline,history}.a /usr/lib</userinput></screen> +<screen><userinput remap="install">mv -v /lib/lib{readline,history}.a /usr/lib</userinput></screen> <para>Next, remove the <filename class="extension">.so</filename> files in <filename class="directory">/lib</filename> and relink them into <filename class="directory">/usr/lib</filename>:</para> -<screen><userinput>rm -v /lib/lib{readline,history}.so +<screen><userinput remap="install">rm -v /lib/lib{readline,history}.so ln -sfv ../../lib/libreadline.so.5 /usr/lib/libreadline.so ln -sfv ../../lib/libhistory.so.5 /usr/lib/libhistory.so</userinput></screen> diff --git a/chapter06/sed.xml b/chapter06/sed.xml index 6633ecb78..ce5a9ff75 100644 --- a/chapter06/sed.xml +++ b/chapter06/sed.xml @@ -42,7 +42,7 @@ <para>Prepare Sed for compilation:</para> -<screen><userinput>./configure --prefix=/usr --bindir=/bin --enable-html</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/usr --bindir=/bin --enable-html</userinput></screen> <variablelist> <title>The meaning of the new configure option:</title> @@ -57,14 +57,15 @@ <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make check</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml index d91d80960..e5d1b4896 100644 --- a/chapter06/shadow.xml +++ b/chapter06/shadow.xml @@ -53,11 +53,11 @@ <command>usermod</command> programs which prevent them from accepting group names rather than group ID numbers to the <option>-g</option> option:</para> -<screen><userinput>patch -Np1 -i ../&shadow-useradd-patch;</userinput></screen> +<screen><userinput remap="pre">patch -Np1 -i ../&shadow-useradd-patch;</userinput></screen> <para>Prepare Shadow for compilation:</para> -<screen><userinput>./configure --libdir=/lib --sysconfdir=/etc --enable-shared \ +<screen><userinput remap="configure">./configure --libdir=/lib --sysconfdir=/etc --enable-shared \ --without-selinux</userinput></screen> <variablelist> @@ -77,19 +77,19 @@ <para>Disable the installation of the <command>groups</command> program and its man pages, as Coreutils provides a better version:</para> -<screen><userinput>sed -i 's/groups$(EXEEXT) //' src/Makefile +<screen><userinput remap="configure">sed -i 's/groups$(EXEEXT) //' src/Makefile find man -name Makefile -exec sed -i 's/groups\.1 / /' {} \;</userinput></screen> <para>Disable the installation of Chinese and Korean manual pages, since Man-DB cannot format them properly:</para> -<screen><userinput>sed -i -e 's/ ko//' -e 's/ zh_CN zh_TW//' man/Makefile</userinput></screen> +<screen><userinput remap="configure">sed -i -e 's/ ko//' -e 's/ zh_CN zh_TW//' man/Makefile</userinput></screen> <para>Shadow supplies other manual pages in a UTF-8 encoding. Man-DB can display these in the recommended encodings by using the <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 remap="configure">for i in de es fi fr id it pt_BR; do convert-mans UTF-8 ISO-8859-1 man/${i}/*.? done @@ -109,7 +109,7 @@ convert-mans UTF-8 ISO-8859-9 man/tr/*.?</userinput></screen> for user mailboxes that Shadow uses by default to the <filename 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 remap="configure">sed -i -e 's@#MD5_CRYPT_ENAB.no@MD5_CRYPT_ENAB yes@' \ -e 's@/var/spool/mail@/var/mail@' etc/login.defs</userinput></screen> <note> @@ -121,21 +121,21 @@ convert-mans UTF-8 ISO-8859-9 man/tr/*.?</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> <para>This package does not come with a test suite.</para> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> <para>Move a misplaced program to its proper location:</para> -<screen><userinput>mv -v /usr/bin/passwd /bin</userinput></screen> +<screen><userinput remap="install">mv -v /usr/bin/passwd /bin</userinput></screen> <para>Move Shadow's libraries to more appropriate locations:</para> -<screen><userinput>mv -v /lib/libshadow.*a /usr/lib +<screen><userinput remap="install">mv -v /lib/libshadow.*a /usr/lib rm -v /lib/libshadow.so ln -sfv ../../lib/libshadow.so.0 /usr/lib/libshadow.so</userinput></screen> diff --git a/chapter06/sysklogd.xml b/chapter06/sysklogd.xml index 29f68b356..f26d8df58 100644 --- a/chapter06/sysklogd.xml +++ b/chapter06/sysklogd.xml @@ -43,13 +43,13 @@ <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> <para>This package does not come with a test suite.</para> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter06/sysvinit.xml b/chapter06/sysvinit.xml index 0ff172116..dddd77408 100644 --- a/chapter06/sysvinit.xml +++ b/chapter06/sysvinit.xml @@ -52,18 +52,18 @@ <quote>Sending processes configured via /etc/inittab the TERM signal</quote> instead:</para> -<screen><userinput>sed -i 's@Sending processes@& configured via /etc/inittab@g' \ +<screen><userinput remap="pre">sed -i 's@Sending processes@& configured via /etc/inittab@g' \ src/init.c</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make -C src</userinput></screen> +<screen><userinput remap="make">make -C src</userinput></screen> <para>This package does not come with a test suite.</para> <para>Install the package:</para> -<screen><userinput>make -C src install</userinput></screen> +<screen><userinput remap="install">make -C src install</userinput></screen> </sect2> diff --git a/chapter06/tar.xml b/chapter06/tar.xml index 2f7bc7534..a5dfa0a0d 100644 --- a/chapter06/tar.xml +++ b/chapter06/tar.xml @@ -42,18 +42,19 @@ <para>Prepare Tar for compilation:</para> -<screen><userinput>./configure --prefix=/usr --bindir=/bin --libexecdir=/usr/sbin</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/usr --bindir=/bin --libexecdir=/usr/sbin</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make check</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml index 44e893c1b..69916295a 100644 --- a/chapter06/texinfo.xml +++ b/chapter06/texinfo.xml @@ -47,33 +47,34 @@ in UTF-8 based locales. The patch below makes them valid by falling back to English messages when a multibyte locale is in use:</para> -<screen><userinput>patch -Np1 -i ../&texinfo-multibyte-patch;</userinput></screen> +<screen><userinput remap="pre">patch -Np1 -i ../&texinfo-multibyte-patch;</userinput></screen> <para>Texinfo allows local users to overwrite arbitrary files via a symlink attack on temporary files. Apply the following patch to fix this:</para> -<screen><userinput>patch -Np1 -i ../&texinfo-tempfile_fix-patch;</userinput></screen> +<screen><userinput remap="pre">patch -Np1 -i ../&texinfo-tempfile_fix-patch;</userinput></screen> <para>Prepare Texinfo for compilation:</para> -<screen><userinput>./configure --prefix=/usr</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make check</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> <para>Optionally, install the components belonging in a TeX installation:</para> <!-- FIXME: doesn't the TeX installation in BLFS overwrite files there? --> -<screen><userinput>make TEXMF=/usr/share/texmf install-tex</userinput></screen> +<screen><userinput remap="install">make TEXMF=/usr/share/texmf install-tex</userinput></screen> <variablelist> <title>The meaning of the make parameter:</title> diff --git a/chapter06/udev.xml b/chapter06/udev.xml index 21499bca4..47660a649 100644 --- a/chapter06/udev.xml +++ b/chapter06/udev.xml @@ -44,12 +44,12 @@ <para>The udev-config tarball contains LFS-specific files used to configure Udev. Unpack it into the Udev source directory:</para> -<screen><userinput>tar -xvf ../&udev-config;.tar.bz2</userinput></screen> +<screen><userinput remap="pre">tar -xvf ../&udev-config;.tar.bz2</userinput></screen> <para>Create some devices and directories that Udev cannot handle due to them being required very early in the boot process:</para> -<screen><userinput>install -dv /lib/{firmware,udev/devices/{pts,shm}} +<screen><userinput remap="pre">install -dv /lib/{firmware,udev/devices/{pts,shm}} mknod -m0666 /lib/udev/devices/null c 1 3 ln -sv /proc/self/fd /lib/udev/devices/fd ln -sv /proc/self/fd/0 /lib/udev/devices/stdin @@ -59,7 +59,7 @@ ln -sv /proc/kcore /lib/udev/devices/core</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make EXTRAS="`echo extras/*/`"</userinput></screen> +<screen><userinput remap="make">make EXTRAS="`echo extras/*/`"</userinput></screen> <variablelist> <title>The meaning of the make option:</title> @@ -74,15 +74,16 @@ ln -sv /proc/kcore /lib/udev/devices/core</userinput></screen> </variablelist> - <para>To test the results, issue: - <userinput>make test</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make test</userinput></screen> <para>Note that the Udev testsuite will produce numerous messages in the host system's logs. These are harmless and can be ignored.</para> <para>Install the package:</para> -<screen><userinput>make DESTDIR=/ EXTRAS="`echo extras/*/`" install</userinput></screen> +<screen><userinput remap="install">make DESTDIR=/ EXTRAS="`echo extras/*/`" install</userinput></screen> <variablelist> <title>The meaning of the make parameter:</title> @@ -102,27 +103,27 @@ ln -sv /proc/kcore /lib/udev/devices/core</userinput></screen> installs a few configuration files by default. First install the commonly-used rules files provided by Udev:</para> -<screen><userinput>cp -v etc/udev/rules.d/[0-9]* /etc/udev/rules.d/</userinput></screen> +<screen><userinput remap="install">cp -v etc/udev/rules.d/[0-9]* /etc/udev/rules.d/</userinput></screen> <para>Now install the LFS-specific rules files:</para> -<screen><userinput>cd &udev-config; +<screen><userinput remap="install">cd &udev-config; make install</userinput></screen> <para>Install the documentation that explains the LFS-specific rules files:</para> -<screen><userinput>make install-doc</userinput></screen> +<screen><userinput remap="install">make install-doc</userinput></screen> <para>Install the documentation that explains the commonly-used rules files provided by Udev:</para> -<screen><userinput>make install-extra-doc</userinput></screen> +<screen><userinput remap="install">make install-extra-doc</userinput></screen> <para>Install the documentation that explains how to create custom Udev rules:</para> -<screen><userinput>cd .. +<screen><userinput remap="install">cd .. install -m644 -v docs/writing_udev_rules/index.html \ /usr/share/doc/udev-&udev-version;/index.html</userinput></screen> diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml index 1335c8754..9f6830f86 100644 --- a/chapter06/util-linux.xml +++ b/chapter06/util-linux.xml @@ -49,7 +49,7 @@ <command>hwclock</command> program FHS-compliant, run the following:</para> -<screen><userinput>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' .) mkdir -pv /var/lib/hwclock</userinput></screen> @@ -61,16 +61,16 @@ mkdir -pv /var/lib/hwclock</userinput></screen> <para>Util-linux fails to compile against newer versions of Linux kernel headers. The following patches properly fix the problems:</para> -<screen><userinput>patch -Np1 -i ../&util-linux-cramfs-patch; +<screen><userinput remap="pre">patch -Np1 -i ../&util-linux-cramfs-patch; patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen> <para>Prepare Util-linux for compilation:</para> -<screen><userinput>./configure</userinput></screen> +<screen><userinput remap="configure">./configure</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make HAVE_KILL=yes HAVE_SLN=yes</userinput></screen> +<screen><userinput remap="make">make HAVE_KILL=yes HAVE_SLN=yes</userinput></screen> <variablelist> <title>The meaning of the make parameters:</title> @@ -98,7 +98,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen> <para>Install the package:</para> -<screen><userinput>make HAVE_KILL=yes HAVE_SLN=yes install</userinput></screen> +<screen><userinput remap="install">make HAVE_KILL=yes HAVE_SLN=yes install</userinput></screen> </sect2> diff --git a/chapter06/vim.xml b/chapter06/vim.xml index 22b9523cf..a1f4d32fd 100644 --- a/chapter06/vim.xml +++ b/chapter06/vim.xml @@ -58,7 +58,7 @@ the upstream maintainers since the inital release of Vim-&vim-version;: </para> -<screen><userinput>patch -Np1 -i ../&vim-fixes-patch;</userinput></screen> +<screen><userinput remap="pre">patch -Np1 -i ../&vim-fixes-patch;</userinput></screen> <para>This version of Vim installs translated man pages and places them into directories that will not be searched by Man-DB. Patch Vim @@ -66,17 +66,17 @@ ultimately allows Man-DB to transcode the page into the desired format at run-time:</para> -<screen><userinput>patch -Np1 -i ../&vim-mandir-patch;</userinput></screen> +<screen><userinput remap="pre">patch -Np1 -i ../&vim-mandir-patch;</userinput></screen> <para>Finally, change the default location of the <filename>vimrc</filename> configuration file to <filename class="directory">/etc</filename>:</para> -<screen><userinput>echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h</userinput></screen> +<screen><userinput remap="pre">echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h</userinput></screen> <para>Now prepare Vim for compilation:</para> -<screen><userinput>./configure --prefix=/usr --enable-multibyte</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/usr --enable-multibyte</userinput></screen> <variablelist> <title>The meaning of the configure options:</title> @@ -96,16 +96,19 @@ <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: <userinput>make test</userinput>. However, - this test suite outputs a lot of binary data to the screen, which can cause - issues with the settings of the current terminal. This can be resolved by - redirecting the output to a log file.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make test</userinput></screen> + + <para>However, this test suite outputs a lot of binary data to the screen, + which can cause issues with the settings of the current terminal. This can + be resolved by redirecting the output to a log file.</para> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> <para>Many users are used to using <command>vi</command> instead of <command>vim</command>. To allow execution of <command>vim</command> @@ -113,7 +116,7 @@ symlink for both the binary and the man page in the provided languages:</para> -<screen><userinput>ln -sv vim /usr/bin/vi +<screen><userinput remap="install">ln -sv vim /usr/bin/vi for L in "" fr it pl ru; do ln -sv vim.1 /usr/share/man/$L/man1/vi.1 done</userinput></screen> @@ -124,7 +127,7 @@ done</userinput></screen> class="directory">/usr/share/doc/vim-&vim-version;</filename>, making it consistent with the location of documentation for other packages:</para> -<screen><userinput>ln -sv ../&vim-docdir;/doc /usr/share/doc/vim-&vim-version;</userinput></screen> +<screen><userinput remap="install">ln -sv ../&vim-docdir;/doc /usr/share/doc/vim-&vim-version;</userinput></screen> <para>If an X Window System is going to be installed on the LFS system, it may be necessary to recompile Vim after installing X. Vim diff --git a/chapter06/zlib.xml b/chapter06/zlib.xml index 0fa477901..6a4eadbc0 100644 --- a/chapter06/zlib.xml +++ b/chapter06/zlib.xml @@ -52,43 +52,45 @@ <para>Prepare Zlib for compilation:</para> -<screen><userinput>./configure --prefix=/usr --shared --libdir=/lib</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/usr --shared --libdir=/lib</userinput></screen> <para>Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> - <para>To test the results, issue: - <userinput>make check</userinput>.</para> + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> <para>Install the shared library:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> <para>The previous command installed a <filename class="extension">.so</filename> file in <filename class="directory">/lib</filename>. We will remove it and relink it into <filename class="directory">/usr/lib</filename>:</para> -<screen><userinput>rm -v /lib/libz.so +<screen><userinput remap="install">rm -v /lib/libz.so ln -sfv ../../lib/libz.so.&zlib-version; /usr/lib/libz.so</userinput></screen> <para>Build the static library:</para> -<screen><userinput>make clean +<screen><userinput remap="make">make clean ./configure --prefix=/usr make</userinput></screen> - <para>To test the results again, issue: - <userinput>make check</userinput>.</para> + <para>To test the results again, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> <para>Install the static library:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> <para>Fix the permissions on the static library:</para> -<screen><userinput>chmod -v 644 /usr/lib/libz.a</userinput></screen> +<screen><userinput remap="install">chmod -v 644 /usr/lib/libz.a</userinput></screen> </sect2> diff --git a/chapter07/bootscripts.xml b/chapter07/bootscripts.xml index 3f626486c..8d7cb2104 100644 --- a/chapter07/bootscripts.xml +++ b/chapter07/bootscripts.xml @@ -43,7 +43,7 @@ <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen><userinput remap="install">make install</userinput></screen> </sect2> diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml index 3c96b6437..de0e4b1df 100644 --- a/chapter08/kernel.xml +++ b/chapter08/kernel.xml @@ -47,7 +47,7 @@ <para>Prepare for compilation by running the following command:</para> -<screen><userinput>make mrproper</userinput></screen> +<screen><userinput remap="pre">make mrproper</userinput></screen> <para>This ensures that the kernel tree is absolutely clean. The kernel team recommends that this command be issued prior to each @@ -96,7 +96,7 @@ <para>Compile the kernel image and modules:</para> -<screen><userinput>make</userinput></screen> +<screen><userinput remap="make">make</userinput></screen> <para>If using kernel modules, an <filename>/etc/modprobe.conf</filename> file may be needed. Information pertaining to modules and kernel @@ -107,7 +107,7 @@ <para>Install the modules, if the kernel configuration uses them:</para> -<screen><userinput>make modules_install</userinput></screen> +<screen><userinput remap="install">make modules_install</userinput></screen> <para>After kernel compilation is complete, additional steps are required to complete the installation. Some files need to be copied to @@ -116,14 +116,14 @@ <para>The path to the kernel image may vary depending on the platform being used. The following command assumes an x86 architecture:</para> -<screen><userinput>cp -v arch/i386/boot/bzImage /boot/lfskernel-&linux-version;</userinput></screen> +<screen><userinput remap="install">cp -v arch/i386/boot/bzImage /boot/lfskernel-&linux-version;</userinput></screen> <para><filename>System.map</filename> is a symbol file for the kernel. It maps the function entry points of every function in the kernel API, as well as the addresses of the kernel data structures for the running kernel. Issue the following command to install the map file:</para> -<screen><userinput>cp -v System.map /boot/System.map-&linux-version;</userinput></screen> +<screen><userinput remap="install">cp -v System.map /boot/System.map-&linux-version;</userinput></screen> <para>The kernel configuration file <filename>.config</filename> produced by the <command>make menuconfig</command> step @@ -131,11 +131,11 @@ that was just compiled. It is a good idea to keep this file for future reference:</para> -<screen><userinput>cp -v .config /boot/config-&linux-version;</userinput></screen> +<screen><userinput remap="install">cp -v .config /boot/config-&linux-version;</userinput></screen> <para>Install the documentation for the Linux kernel:</para> -<screen><userinput>install -d /usr/share/doc/linux-&linux-version; +<screen><userinput remap="install">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 4f8906748..0536a4864 100644 --- a/general.ent +++ b/general.ent @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!ENTITY version "SVN-JH-20070916"> -<!ENTITY releasedate "September 16, 2007"> +<!ENTITY version "SVN-JH-20070918"> +<!ENTITY releasedate "September 18, 2007"> <!ENTITY milestone "7.0"> <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> |