Changeset 8392

Show
Ignore:
Timestamp:
09/18/07 15:39:40 (1 year ago)
Author:
manuel
Message:

Merged r8389:8391 from trunk.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/jh/BOOK/chapter01/changelog.xml

    r8386 r8392  
    3737--> 
    3838 
     39     <listitem> 
     40      <para>2007-09-18</para> 
     41      <itemizedlist> 
     42        <listitem> 
     43          <para>[manuel] - Added remap attributes to userinput tags in packages 
     44          pages to help adding package manager support and other extensions 
     45          into jhalfs. Made all testsuite commands screen blocks for 
     46          consistency.</para> 
     47        </listitem> 
     48      </itemizedlist> 
     49    </listitem> 
     50 
    3951    <listitem> 
    4052      <para>2007-09-16</para> 

  • branches/jh/BOOK/chapter05/bash.xml

    r8367 r8392  
    4747    Bash-&bash-version;:</para> 
    4848 
    49 <screen><userinput>patch -Np1 -i ../&bash-fixes-patch;</userinput></screen> 
     49<screen><userinput remap="pre">patch -Np1 -i ../&bash-fixes-patch;</userinput></screen> 
    5050 
    5151    <para>Prepare Bash for compilation:</para> 
    5252 
    53 <screen><userinput>./configure --prefix=/tools --without-bash-malloc</userinput></screen> 
     53<screen><userinput remap="configure">./configure --prefix=/tools --without-bash-malloc</userinput></screen> 
    5454 
    5555    <variablelist> 
    …… 
    7171    <para>Compile the package:</para> 
    7272 
    73 <screen><userinput>make</userinput></screen> 
     73<screen><userinput remap="make">make</userinput></screen> 
    7474 
    75     <para>To test the results, issue: 
    76     <userinput>make tests</userinput>.</para> 
     75    <para>To test the results, issue:</para> 
     76 
     77<screen><userinput remap="test">make tests</userinput></screen> 
    7778 
    7879    <para>Install the package:</para> 
    7980 
    80 <screen><userinput>make install</userinput></screen> 
     81<screen><userinput remap="install">make install</userinput></screen> 
    8182 
    8283    <para>Make a link for the programs that use <command>sh</command> for 
    8384    a shell:</para> 
    8485 
    85 <screen><userinput>ln -vs bash /tools/bin/sh</userinput></screen> 
     86<screen><userinput remap="install">ln -vs bash /tools/bin/sh</userinput></screen> 
    8687 
    8788  </sect2> 

  • branches/jh/BOOK/chapter05/binutils-pass1.xml

    r8367 r8392  
    5252    source directory in a dedicated build directory:</para> 
    5353 
    54 <screen><userinput>mkdir -v ../binutils-build 
     54<screen><userinput remap="pre">mkdir -v ../binutils-build 
    5555cd ../binutils-build</userinput></screen> 
    5656 
    …… 
    6666    <para>Now prepare Binutils for compilation:</para> 
    6767 
    68 <screen><userinput>CC="gcc -B/usr/bin/" ../binutils-&binutils-version;/configure \ 
     68<screen><userinput remap="configure">CC="gcc -B/usr/bin/" ../binutils-&binutils-version;/configure \ 
    6969    --prefix=/tools --disable-nls --disable-werror</userinput></screen> 
    7070 
    …… 
    112112    <para>Continue with compiling the package:</para> 
    113113 
    114 <screen><userinput>make</userinput></screen> 
     114<screen><userinput remap="make">make</userinput></screen> 
    115115 
    116116    <para>Compilation is now complete. Ordinarily we would now run the 
    …… 
    122122    <para>Create a symlink to ensure the sanity of our toolchain:</para> 
    123123 
    124 <screen><userinput>mkdir -v /tools/lib 
     124<screen><userinput remap="install">mkdir -v /tools/lib 
    125125ln -sv lib /tools/lib64</userinput></screen> 
    126126 
    127127    <para>Install the package:</para> 
    128128 
    129 <screen><userinput>make install</userinput></screen> 
     129<screen><userinput remap="install">make install</userinput></screen> 
    130130 
    131131    <para>Finally, prepare the linker for the <quote>Adjusting</quote> phase 
    132132    later on:</para> 
    133133 
    134 <screen><userinput>make -C ld clean 
     134<screen><userinput remap="adjust">make -C ld clean 
    135135make -C ld LIB_PATH=/tools/lib 
    136136cp -v ld/ld-new /tools/bin</userinput></screen> 

  • branches/jh/BOOK/chapter05/binutils-pass2.xml

    r8367 r8392  
    4646    <para>Create a separate build directory again:</para> 
    4747 
    48 <screen><userinput>mkdir -v ../binutils-build 
     48<screen><userinput remap="pre">mkdir -v ../binutils-build 
    4949cd ../binutils-build</userinput></screen> 
    5050 
    5151    <para>Prepare Binutils for compilation:</para> 
    5252 
    53 <screen><userinput>../binutils-&binutils-version;/configure --prefix=/tools \ 
     53<screen><userinput remap="configure">../binutils-&binutils-version;/configure --prefix=/tools \ 
    5454    --disable-nls --with-lib-path=/tools/lib</userinput></screen> 
    5555 
    …… 
    7272    <para>Compile the package:</para> 
    7373 
    74 <screen><userinput>make</userinput></screen> 
     74<screen><userinput remap="make">make</userinput></screen> 
    7575 
    7676    <para>Compilation is now complete. As discussed earlier, running the 
    …… 
    7979    command:</para> 
    8080 
    81 <screen><userinput>make check</userinput></screen> 
     81<screen><userinput remap="test">make check</userinput></screen> 
    8282 
    8383    <para>Install the package:</para> 
    8484 
    85 <screen><userinput>make install</userinput></screen> 
     85<screen><userinput remap="install">make install</userinput></screen> 
    8686 
    8787    <para>Now prepare the linker for the <quote>Re-adjusting</quote> phase in 
    8888    the next chapter:</para> 
    8989 
    90 <screen><userinput>make -C ld clean 
     90<screen><userinput remap="adjust">make -C ld clean 
    9191make -C ld LIB_PATH=/usr/lib:/lib 
    9292cp -v ld/ld-new /tools/bin</userinput></screen> 
    93  
    9493 
    9594  </sect2> 

  • branches/jh/BOOK/chapter05/bison.xml

    r8367 r8392  
    4646    <para>Prepare Bison for compilation:</para> 
    4747 
    48 <screen><userinput>./configure --prefix=/tools</userinput></screen> 
     48<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen> 
    4949 
    5050    <para>Compile the package:</para> 
    5151 
    52 <screen><userinput>make</userinput></screen> 
     52<screen><userinput remap="make">make</userinput></screen> 
    5353 
    54     <para>To test the results, issue: 
    55     <userinput>make check</userinput>.</para> 
     54    <para>To test the results, issue:</para> 
     55 
     56<screen><userinput remap="test">make check</userinput></screen> 
    5657 
    5758    <para>Install the package:</para> 
    5859 
    59 <screen><userinput>make install</userinput></screen> 
     60<screen><userinput remap="install">make install</userinput></screen> 
    6061 
    6162  </sect2> 

  • branches/jh/BOOK/chapter05/bzip2.xml

    r8367 r8392  
    4747    script. Compile and test it with:</para> 
    4848 
    49 <screen><userinput>make</userinput></screen> 
     49<screen><userinput remap="make">make</userinput></screen> 
    5050 
    5151    <para>Install the package:</para> 
    5252 
    53 <screen><userinput>make PREFIX=/tools install</userinput></screen> 
     53<screen><userinput remap="install">make PREFIX=/tools install</userinput></screen> 
    5454 
    5555  </sect2> 

  • branches/jh/BOOK/chapter05/coreutils.xml

    r8367 r8392  
    4848    Glibc provides, so we'll rename the function:</para> 
    4949 
    50 <screen><userinput>for file in src/{copy,touch}.c lib/utimens.{c,h} ; do \ 
     50<screen><userinput remap="pre">for file in src/{copy,touch}.c lib/utimens.{c,h} ; do \ 
    5151   cp -v $file{,.orig} 
    5252   sed 's/futimens/gl_&amp;/' $file.orig &gt; $file 
    …… 
    5555    <para>Prepare Coreutils for compilation:</para> 
    5656 
    57 <screen><userinput>./configure --prefix=/tools</userinput></screen> 
     57<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen> 
    5858 
    5959    <para>Compile the package:</para> 
    6060 
    61 <screen><userinput>make</userinput></screen> 
     61<screen><userinput remap="make">make</userinput></screen> 
    6262 
    63     <para>To test the results, issue: 
    64     <userinput>make RUN_EXPENSIVE_TESTS=yes check</userinput>. The 
    65     <parameter>RUN_EXPENSIVE_TESTS=yes</parameter> parameter tells the 
     63    <para>To test the results, issue:</para> 
     64 
     65<screen><userinput remap="test">make RUN_EXPENSIVE_TESTS=yes check</userinput></screen> 
     66 
     67    <para>The <parameter>RUN_EXPENSIVE_TESTS=yes</parameter> parameter tells the 
    6668    test suite to run several additional tests that are considered 
    6769    relatively expensive (in terms of CPU power and memory usage) on some 
    …… 
    7072    <para>Install the package:</para> 
    7173 
    72 <screen><userinput>make install</userinput></screen> 
     74<screen><userinput remap="install">make install</userinput></screen> 
    7375 
    7476    <para>The above command refuses to install <filename>su</filename> 
    …… 
    7981    it with:</para> 
    8082 
    81 <screen><userinput>cp -v src/su /tools/bin/su-tools</userinput></screen> 
     83<screen><userinput remap="install">cp -v src/su /tools/bin/su-tools</userinput></screen> 
    8284 
    8385  </sect2> 

  • branches/jh/BOOK/chapter05/dejagnu.xml

    r8367 r8392  
    4444    <para>Prepare DejaGNU for compilation:</para> 
    4545 
    46 <screen><userinput>./configure --prefix=/tools</userinput></screen> 
     46<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen> 
    4747 
    4848    <para>Build and install the package:</para> 
    4949 
    50 <screen><userinput>make install</userinput></screen> 
     50<screen><userinput remap="install">make install</userinput></screen> 
    5151 
    52     <para>To test the results, issue: 
    53     <userinput>make check</userinput>.</para> 
     52    <para>To test the results, issue:</para> 
     53 
     54<screen><userinput remap="test">make check</userinput></screen> 
    5455 
    5556  </sect2> 

  • branches/jh/BOOK/chapter05/diffutils.xml

    r8367 r8392  
    4646    <para>Prepare Diffutils for compilation:</para> 
    4747 
    48 <screen><userinput>./configure --prefix=/tools</userinput></screen> 
     48<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen> 
    4949 
    5050    <para>Compile the package:</para> 
    5151 
    52 <screen><userinput>make</userinput></screen> 
     52<screen><userinput remap="make">make</userinput></screen> 
    5353 
    5454    <para>This package does not come with a test suite.</para> 
    …… 
    5656    <para>Install the package:</para> 
    5757 
    58 <screen><userinput>make install</userinput></screen> 
     58<screen><userinput remap="install">make install</userinput></screen> 
    5959 
    6060  </sect2> 

  • branches/jh/BOOK/chapter05/expect.xml

    r8367 r8392  
    4545    suite run:</para> 
    4646 
    47 <screen><userinput>patch -Np1 -i ../&expect-spawn-patch;</userinput></screen> 
     47<screen><userinput remap="pre">patch -Np1 -i ../&expect-spawn-patch;</userinput></screen> 
    4848 
    4949    <para>Next, force Expect's configure script to use <filename>/bin/stty</filename> 
    …… 
    5252    toolchain:</para> 
    5353 
    54 <screen><userinput>cp configure{,.bak} 
     54<screen><userinput remap="pre">cp configure{,.bak} 
    5555sed 's:/usr/local/bin:/bin:' configure.bak &gt; configure</userinput></screen> 
    5656 
    5757    <para>Now prepare Expect for compilation:</para> 
    5858 
    59 <screen><userinput>./configure --prefix=/tools --with-tcl=/tools/lib \ 
     59<screen><userinput remap="configure">./configure --prefix=/tools --with-tcl=/tools/lib \ 
    6060  --with-tclinclude=/tools/include --with-x=no</userinput></screen> 
    6161 
    …… 
    9696    <para>Build the package:</para> 
    9797 
    98 <screen><userinput>make</userinput></screen> 
     98<screen><userinput remap="make">make</userinput></screen> 
    9999 
    100     <para>To test the results, issue: <userinput>make test</userinput>. 
    101     Note that the Expect test suite is known to experience failures under 
     100    <para>To test the results, issue:</para> 
     101 
     102<screen><userinput remap="test">make test</userinput></screen> 
     103 
     104    <para>Note that the Expect test suite is known to experience failures under 
    102105    certain host conditions that are not within our control. Therefore, 
    103106    test suite failures here are not surprising and are not considered 
    …… 
    106109    <para>Install the package:</para> 
    107110 
    108 <screen><userinput>make SCRIPTS="" install</userinput></screen> 
     111<screen><userinput remap="install">make SCRIPTS="" install</userinput></screen> 
    109112 
    110113    <variablelist> 

  • branches/jh/BOOK/chapter05/findutils.xml

    r8367 r8392  
    4646    <para>Prepare Findutils for compilation:</para> 
    4747 
    48 <screen><userinput>./configure --prefix=/tools</userinput></screen> 
     48<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen> 
    4949 
    5050    <para>Compile the package:</para> 
    5151 
    52 <screen><userinput>make</userinput></screen> 
     52<screen><userinput remap="make">make</userinput></screen> 
    5353 
    54     <para>To test the results, issue: 
    55     <userinput>make check</userinput>.</para> 
     54    <para>To test the results, issue:</para> 
     55 
     56<screen><userinput remap="test">make check</userinput></screen> 
    5657 
    5758    <para>Install the package:</para> 
    5859 
    59 <screen><userinput>make install</userinput></screen> 
     60<screen><userinput remap="install">make install</userinput></screen> 
    6061 
    6162  </sect2> 

  • branches/jh/BOOK/chapter05/flex.xml

    r8367 r8392  
    4646    <para>Prepare Flex for compilation:</para> 
    4747 
    48 <screen><userinput>./configure --prefix=/tools</userinput></screen> 
     48<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen> 
    4949 
    5050    <para>Compile the package:</para> 
    5151 
    52 <screen><userinput>make</userinput></screen> 
     52<screen><userinput remap="make">make</userinput></screen> 
    5353 
    54     <para>To test the results, issue: 
    55     <userinput>make check</userinput>.</para> 
     54    <para>To test the results, issue:</para> 
     55 
     56<screen><userinput remap="test">make check</userinput></screen> 
    5657 
    5758    <para>Install the package:</para> 
    5859 
    59 <screen><userinput>make install</userinput></screen> 
     60<screen><userinput remap="install">make install</userinput></screen> 
    6061 
    6162  </sect2> 

  • branches/jh/BOOK/chapter05/gawk.xml

    r8367 r8392  
    4646    <para>Prepare Gawk for compilation:</para> 
    4747 
    48 <screen><userinput>./configure --prefix=/tools</userinput></screen> 
     48<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen> 
    4949 
    5050    <para>Due to a bug in the <command>configure</command> script, Gawk fails 
    …… 
    5353    missing macro definitions to <filename>config.h</filename>:</para> 
    5454 
    55 <screen><userinput>cat &gt;&gt; config.h &lt;&lt; "EOF" 
     55<screen><userinput remap="configure">cat &gt;&gt; config.h &lt;&lt; "EOF" 
    5656<literal>#define HAVE_LANGINFO_CODESET 1 
    5757#define HAVE_LC_MESSAGES 1</literal> 
    …… 
    6060    <para>Compile the package:</para> 
    6161 
    62 <screen><userinput>make</userinput></screen> 
     62<screen><userinput remap="make">make</userinput></screen> 
    6363 
    64     <para>To test the results, issue: 
    65     <userinput>make check</userinput>.</para> 
     64    <para>To test the results, issue:</para> 
     65 
     66<screen><userinput remap="test">make check</userinput></screen> 
    6667 
    6768    <para>Install the package:</para> 
    6869 
    69 <screen><userinput>make install</userinput></screen> 
     70<screen><userinput remap="install">make install</userinput></screen> 
    7071 
    7172  </sect2> 

  • branches/jh/BOOK/chapter05/gcc-pass1.xml

    r8382 r8392  
    4747    source directory in a dedicated build directory:</para> 
    4848 
    49 <screen><userinput>mkdir -v ../gcc-build 
     49<screen><userinput remap="pre">mkdir -v ../gcc-build 
    5050cd ../gcc-build</userinput></screen> 
    5151 
    5252    <para>Prepare GCC for compilation:</para> 
    5353 
    54 <screen><userinput>CC="gcc -B/usr/bin/" ../gcc-&gcc-version;/configure --prefix=/tools \ 
     54<screen><userinput remap="configure">CC="gcc -B/usr/bin/" ../gcc-&gcc-version;/configure --prefix=/tools \ 
    5555    --with-local-prefix=/tools --disable-nls --disable-shared \ 
    5656    --enable-languages=c --disable-multilib</userinput></screen> 
    …… 
    113113    package. Continue with compiling by running:</para> 
    114114 
    115 <screen><userinput>make</userinput></screen> 
     115<screen><userinput remap="make">make</userinput></screen> 
    116116 
    117117    <para>Compilation is now complete. At this point, the test suite would 
    …… 
    123123    <para>Install the package:</para> 
    124124 
    125 <screen><userinput>make install</userinput></screen> 
     125<screen><userinput remap="install">make install</userinput></screen> 
    126126 
    127127    <para>Using <command>--disable-shared</command> means that the file 
    …… 
    144144    which C compiler to install:</para> 
    145145 
    146 <screen><userinput>ln -vs gcc /tools/bin/cc</userinput></screen> 
     146<screen><userinput remap="install">ln -vs gcc /tools/bin/cc</userinput></screen> 
    147147 
    148148  </sect2> 

  • branches/jh/BOOK/chapter05/gcc-pass2.xml

    r8382 r8392  
    5454    performing a quick test:</para> 
    5555 
    56 <screen><userinput>expect -c "spawn ls"</userinput></screen> 
     56<screen><userinput remap="test">expect -c "spawn ls"</userinput></screen> 
    5757 
    5858    <para>The response might be:</para> 
    …… 
    7878    be suppressed by issuing the following commands:</para> 
    7979 
    80 <screen><userinput>cp -v gcc/Makefile.in{,.orig} 
     80<screen><userinput remap="pre">cp -v gcc/Makefile.in{,.orig} 
    8181sed 's@\./fixinc\.sh@-c true@' gcc/Makefile.in.orig &gt; gcc/Makefile.in</userinput></screen> 
    8282 
    …… 
    8787    builds:</para> 
    8888 
    89 <screen><userinput>cp -v gcc/Makefile.in{,.tmp} 
     89<screen><userinput remap="pre">cp -v gcc/Makefile.in{,.tmp} 
    9090sed 's/^XCFLAGS =$/&amp; -fomit-frame-pointer/' gcc/Makefile.in.tmp \ 
    9191  &gt; gcc/Makefile.in</userinput></screen> 
    …… 
    100100    against the new Glibc. Issue:</para> 
    101101 
    102 <screen><userinput>for file in $(find gcc/config -name linux64.h -o -name linux.h) 
     102<screen><userinput remap="pre">for file in $(find gcc/config -name linux64.h -o -name linux.h) 
    103103do 
    104104  cp -uv $file{,.orig} 
    …… 
    109109#define STANDARD_INCLUDE_DIR 0" &gt;&gt; $file 
    110110  touch $file.orig 
    111 done</userinput></screen>  
     111done</userinput></screen> 
    112112 
    113113    <para>In case the above seems hard to follow, let's break it down a bit. 
    …… 
    128128    won't attempt to link against libraries on the host:</para> 
    129129 
    130 <screen><userinput>for file in $(find gcc/config -name t-linux64) ; do \ 
     130<screen><userinput remap="pre">for file in $(find gcc/config -name t-linux64) ; do \ 
    131131   cp -v $file{,.orig} 
    132132   sed '/MULTILIB_OSDIRNAMES/d' $file.orig &gt; $file 
    …… 
    135135    <para>Create a separate build directory again:</para> 
    136136 
    137 <screen><userinput>mkdir -v ../gcc-build 
     137<screen><userinput remap="pre">mkdir -v ../gcc-build 
    138138cd ../gcc-build</userinput></screen> 
    139139 
    …… 
    143143    <para>Now prepare GCC for compilation:</para> 
    144144 
    145 <screen><userinput>../gcc-&gcc-version;/configure --prefix=/tools \ 
     145<screen><userinput remap="configure">../gcc-&gcc-version;/configure --prefix=/tools \ 
    146146    --with-local-prefix=/tools --enable-clocale=gnu \ 
    147147    --enable-shared --enable-threads=posix \ 
    …… 
    216216    <para>Compile the package:</para> 
    217217 
    218 <screen><userinput>make</userinput></screen> 
     218<screen><userinput remap="make">make</userinput></screen> 
    219219 
    220220    <para>There is no need to use the <parameter>bootstrap</parameter> target 
    …… 
    226226    To run the GCC test suite anyway, use the following command:</para> 
    227227 
    228 <screen><userinput>make -k check</userinput></screen> 
     228<screen><userinput remap="test">make -k check</userinput></screen> 
    229229 
    230230    <para>The <parameter>-k</parameter> flag is used to make the test suite run 
    …… 
    238238    <para>Install the package:</para> 
    239239 
    240 <screen><userinput>make install</userinput></screen> 
     240<screen><userinput remap="install">make install</userinput></screen> 
    241241 
    242242    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" 

  • branches/jh/BOOK/chapter05/gettext.xml

    r8367 r8392  
    4949    <para>Prepare Gettext for compilation:</para> 
    5050 
    51 <screen><userinput>cd gettext-tools 
     51<screen><userinput remap="configure">cd gettext-tools 
    5252./configure --prefix=/tools --disable-shared</userinput></screen> 
    5353 
    …… 
    6767    <para>Compile the package:</para> 
    6868 
    69 <screen><userinput>make -C gnulib-lib 
     69<screen><userinput remap="make">make -C gnulib-lib 
    7070make -C src msgfmt</userinput></screen> 
    7171 
    …… 
    7777    <para>Install the <command>msgfmt</command> binary:</para> 
    7878 
    79 <screen><userinput>cp -v src/msgfmt /tools/bin</userinput></screen> 
     79<screen><userinput remap="install">cp -v src/msgfmt /tools/bin</userinput></screen> 
    8080 
    8181  </sect2> 

  • branches/jh/BOOK/chapter05/glibc.xml

    r8382 r8392  
    4747    directory in a dedicated build directory:</para> 
    4848 
    49 <screen><userinput>mkdir -v ../glibc-build 
     49<screen><userinput remap="pre">mkdir -v ../glibc-build 
    5050cd ../glibc-build</userinput></screen> 
    5151 
    …… 
    5858    making use of the special file <filename>configparms</filename>:</para> 
    5959 
    60 <screen><userinput>uname -m | grep -q i?86 &amp;&amp; 
     60<screen><userinput remap="configure">uname -m | grep -q i?86 &amp;&amp; 
    6161echo "CFLAGS += -march=i486" &gt; configparms</userinput></screen> 
    6262 
    6363    <para>Next, prepare Glibc for compilation:</para> 
    6464 
    65 <screen><userinput>../glibc-&glibc-version;/configure --prefix=/tools \ 
     65<screen><userinput remap="configure">../glibc-&glibc-version;/configure --prefix=/tools \ 
    6666    --disable-profile --enable-add-ons \ 
    6767    --enable-kernel=2.6.0 --with-binutils=/tools/bin \ 
    …… 
    155155    <para>Compile the package:</para> 
    156156 
    157 <screen><userinput>make</userinput></screen> 
     157<screen><userinput remap="make">make</userinput></screen> 
    158158 
    159159    <para>Compilation is now complete. As mentioned earlier, running the 
    …… 
    162162    command will do so:</para> 
    163163 
    164 <screen><userinput>make check</userinput></screen> 
     164<screen><userinput remap="test">make check</userinput></screen> 
    165165 
    166166    <para>For a discussion of test failures that are of particular 
    …… 
    186186    Prevent this warning with:</para> 
    187187 
    188 <screen><userinput>mkdir -v /tools/etc 
     188<screen><userinput remap="install">mkdir -v /tools/etc 
    189189touch /tools/etc/ld.so.conf</userinput></screen> 
    190190 
    191191    <para>Install the package:</para> 
    192192 
    193 <screen><userinput>make install</userinput></screen> 
     193<screen><userinput remap="install">make install</userinput></screen> 
    194194 
    195195    <para>Different countries and cultures have varying conventions for 

  • branches/jh/BOOK/chapter05/grep.xml

    r8367 r8392  
    4646    <para>Prepare Grep for compilation:</para> 
    4747 
    48 <screen><userinput>./configure --prefix=/tools \ 
     48<screen><userinput remap="configure">./configure --prefix=/tools \ 
    4949    --disable-perl-regexp</userinput></screen> 
    5050 
    …… 
    6666    <para>Compile the package:</para> 
    6767 
    68 <screen><userinput>make</userinput></screen> 
     68<screen><userinput remap="make">make</userinput></screen> 
    6969 
    70     <para>To test the results, issue: 
    71     <userinput>make check</userinput>.</para> 
     70    <para>To test the results, issue:</para> 
     71 
     72<screen><userinput remap="test">make check</userinput></screen> 
    7273 
    7374    <para>Install the package:</para> 
    7475 
    75 <screen><userinput>make install</userinput></screen> 
     76<screen><userinput remap="install">make install</userinput></screen> 
    7677 
    7778  </sect2> 

  • branches/jh/BOOK/chapter05/gzip.xml

    r8367 r8392  
    4848    Glibc provides, so we'll rename the function:</para> 
    4949 
    50 <screen><userinput>for file in gzip.c lib/utimens.{c,h} ; do \ 
     50<screen><userinput remap="pre">for file in gzip.c lib/utimens.{c,h} ; do \ 
    5151   cp -v $file{,.orig} 
    5252   sed 's/futimens/gl_&amp;/' $file.orig &gt; $file 
    …… 
    5555    <para>Prepare Gzip for compilation:</para> 
    5656 
    57 <screen><userinput>./configure --prefix=/tools</userinput></screen> 
     57<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen> 
    5858 
    5959    <para>Compile the package:</para> 
    6060 
    61 <screen><userinput>make</userinput></screen> 
     61<screen><userinput remap="make">make</userinput></screen> 
    6262 
    63     <para>To test the results, issue: 
    64     <userinput>make check</userinput>.</para> 
     63    <para>To test the results, issue:</para> 
     64 
     65<screen><userinput remap="test">make check</userinput></screen> 
    6566 
    6667    <para>Install the package:</para> 
    6768 
    68 <screen><userinput>make install</userinput></screen> 
     69<screen><userinput remap="install">make install</userinput></screen> 
    6970 
    7071  </sect2> 

  • branches/jh/BOOK/chapter05/linux-headers.xml

    r8367 r8392  
    5151    <para>Install the header files:</para> 
    5252 
    53 <screen><userinput>make mrproper 
     53<screen><userinput remap="install">make mrproper 
    5454make headers_check 
    5555make INSTALL_HDR_PATH=dest headers_install 

  • branches/jh/BOOK/chapter05/m4.xml

    r8367 r8392  
    4646    <para>Prepare M4 for compilation:</para> 
    4747 
    48 <screen><userinput>./configure --prefix=/tools</userinput></screen> 
     48<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen> 
    4949 
    5050    <para>Compile the package:</para> 
    5151 
    52 <screen><userinput>make</userinput></screen> 
     52<screen><userinput remap="make">make</userinput></screen> 
    5353 
    54     <para>To test the results, issue: 
    55     <userinput>make check</userinput>.</para> 
     54    <para>To test the results, issue:</para> 
     55 
     56<screen><userinput remap="test">make check</userinput></screen> 
    5657 
    5758    <para>Install the package:</para> 
    5859 
    59 <screen><userinput>make install</userinput></screen> 
     60<screen><userinput remap="install">make install</userinput></screen> 
    6061 
    6162  </sect2> 

  • branches/jh/BOOK/chapter05/make.xml

    r8367 r8392  
    4545    <para>Prepare Make for compilation:</para> 
    4646 
    47 <screen><userinput>./configure --prefix=/tools</userinput></screen> 
     47<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen> 
    4848 
    4949    <para>Compile the package:</para> 
    5050 
    51 <screen><userinput>make</userinput></screen> 
     51<screen><userinput remap="make">make</userinput></screen> 
    5252 
    53     <para>To test the results, issue: 
    54     <userinput>make check</userinput>.</para> 
     53    <para>To test the results, issue:</para> 
     54 
     55<screen><userinput remap="test">make check</userinput></screen> 
    5556 
    5657    <para>Install the package:</para> 
    5758 
    58 <screen><userinput>make install</userinput></screen> 
     59<screen><userinput remap="install">make install</userinput></screen> 
    5960 
    6061  </sect2> 

  • branches/jh/BOOK/chapter05/ncurses.xml