Changeset 3565

Show
Ignore:
Timestamp:
07/22/07 11:32:35 (1 year ago)
Author:
manuel@linuxfromscratch.org
Message:

Some fixes for PDF look.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/clfs-sysroot/BOOK/bootscripts/common/inputrc.xml

    r3464 r3565  
    3737  using the following command:</para> 
    3838 
    39 <screen><userinput>cat &gt; ${CLFS}/etc/inputrc &lt;&lt; "EOF" 
     39<screen><?dbfo keep-together="auto"?><userinput>cat &gt; ${CLFS}/etc/inputrc &lt;&lt; "EOF" 
    4040<literal># Begin /etc/inputrc 
    4141# Modified by Chris Lynn &lt;roryo@roryo.dynup.net&gt; 

  • branches/clfs-sysroot/BOOK/cross-tools/arm/glibc-headers.xml

    r3464 r3565  
    2727    because this only installs the headers; no compiling takes place. In the 
    2828    next Glibc chapter, we use the GCC that's built right after this chapter.</para> 
    29          
     29 
    3030<screen os="s2"><userinput>cp configure{,.orig} 
    3131sed -e 's/3.4/3.[0-9]/g' configure.orig > configure</userinput></screen> 
    …… 
    7373    <variablelist os="dj"> 
    7474       <title>The meaning of the configure options:</title> 
    75          
     75 
    7676          <varlistentry os="dj1"> 
    7777             <term><parameter>CC=gcc</parameter></term> 
    …… 
    8080             </listitem> 
    8181          </varlistentry> 
    82          
     82 
    8383       <varlistentry os="dj2"> 
    8484           <term><parameter>--with-headers=${CLFS}/usr/include</parameter></term> 
    …… 
    9090           </listitem> 
    9191       </varlistentry> 
    92          
     92 
    9393     </variablelist> 
    94          
     94 
    9595   <para os="k">Now, install the headers:</para> 
    9696 
    …… 
    100100    we will copy the additional header files we need.</para> 
    101101 
    102    <para os="n">First we will copy a common file over to <filename  
     102   <para os="n">First we will copy a common file over to <filename 
    103103   class="directory">${CLFS}/usr/include</filename>:</para> 
    104104 
    …… 
    110110 
    111111   <para os="r">Another header is needed for NPTL:</para> 
    112     
    113 <screen os="s"><userinput>cp -v ../glibc-&glibc-version;/ports/sysdeps/unix/sysv/linux/arm/nptl/bits/pthreadtypes.h \ 
     112 
     113<screen os="s"><userinput>cp -v \ 
     114    ../glibc-&glibc-version;/ports/sysdeps/unix/sysv/linux/arm/nptl/bits/pthreadtypes.h \ 
    114115    ${CLFS}/usr/include/bits</userinput></screen> 
    115116 

  • branches/clfs-sysroot/BOOK/cross-tools/arm/variables.xml

    r3464 r3565  
    2222  following command:</para> 
    2323 
    24 <screen os="b"><userinput>export CLFS_HOST="$(echo $MACHTYPE | sed "s/$(echo $MACHTYPE | cut -d- -f2)/cross/")"</userinput></screen> 
     24<screen os="b"><userinput>export CLFS_HOST="$(echo $MACHTYPE | \ 
     25    sed "s/$(echo $MACHTYPE | cut -d- -f2)/cross/")"</userinput></screen> 
    2526 
    2627  <para os="c">Now you will need to set the triplet for the target 

  • branches/clfs-sysroot/BOOK/cross-tools/common/glibc.xml

    r3464 r3565  
    8989<screen os="i"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc" \ 
    9090    AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \ 
    91     ../glibc-&glibc-version;/configure --prefix=/usr --libexecdir=/usr/lib/glibc \ 
    92     --host=${CLFS_TARGET} --build=${CLFS_HOST} \ 
    93     --disable-profile --enable-add-ons \ 
    94     --with-tls --enable-kernel=2.6.0 --with-__thread \ 
    95     --with-binutils=${CLFS}/cross-tools/bin --with-headers=${CLFS}/usr/include \ 
    96     --cache-file=config.cache</userinput></screen> 
     91    ../glibc-&glibc-version;/configure --prefix=/usr \ 
     92    --libexecdir=/usr/lib/glibc --host=${CLFS_TARGET} --build=${CLFS_HOST} \ 
     93    --disable-profile --enable-add-ons --with-tls --enable-kernel=2.6.0 \ 
     94    --with-__thread --with-binutils=${CLFS}/cross-tools/bin \ 
     95    --with-headers=${CLFS}/usr/include --cache-file=config.cache</userinput></screen> 
    9796 
    9897    <variablelist os="j"> 
    …… 
    134133        <term><parameter>--disable-profile</parameter></term> 
    135134        <listitem> 
    136           <para>This builds the libraries without profiling information.  
     135          <para>This builds the libraries without profiling information. 
    137136          Omit this option if profiling on the temporary tools is necessary.</para> 
    138137        </listitem> 
    …… 
    226225export I18NPATH=${PWD}/localedata 
    227226export GCONV_PATH=${PWD}/iconvdata 
    228 export LOCALEDEF="${PWD}/locale/localedef-native --alias-file=../intl/locale.alias" 
     227export LOCALEDEF="${PWD}/locale/localedef-native 
     228    --alias-file=../intl/locale.alias" 
    229229cd ../glibc-&glibc-version;/localedata 
    230230${LOCALEDEF} -i locales/de_DE -f charmaps/ISO-8859-1 --prefix=${CLFS} de_DE 
    231 ${LOCALEDEF} -i locales/de_DE@euro -f charmaps/ISO-8859-15 --prefix=${CLFS} de_DE@euro 
     231${LOCALEDEF} -i locales/de_DE@euro -f charmaps/ISO-8859-15 \ 
     232    --prefix=${CLFS} de_DE@euro 
    232233${LOCALEDEF} -i locales/en_HK -f charmaps/ISO-8859-1 --prefix=${CLFS} en_HK 
    233234${LOCALEDEF} -i locales/en_PH -f charmaps/ISO-8859-1 --prefix=${CLFS} en_PH 
    …… 
    236237${LOCALEDEF} -i locales/fa_IR -f charmaps/UTF-8 --prefix=${CLFS} fa_IR 
    237238${LOCALEDEF} -i locales/fr_FR -f charmaps/ISO-8859-1 --prefix=${CLFS} fr_FR 
    238 ${LOCALEDEF} -i locales/fr_FR@euro -f charmaps/ISO-8859-15 --prefix=${CLFS} fr_FR@euro 
     239${LOCALEDEF} -i locales/fr_FR@euro -f charmaps/ISO-8859-15 \ 
     240    --prefix=${CLFS} fr_FR@euro 
    239241${LOCALEDEF} -i locales/it_IT -f charmaps/ISO-8859-1 --prefix=${CLFS} it_IT 
    240242${LOCALEDEF} -i locales/ja_JP -f charmaps/EUC-JP --prefix=${CLFS} ja_JP 

  • branches/clfs-sysroot/BOOK/cross-tools/common/shadow.xml

    r3464 r3565  
    4242 
    4343<screen><userinput>./configure --prefix=${CLFS}/cross-tools --sbindir=${CLFS}/cross-tools/bin \ 
    44     --sysconfdir=$CLFS/etc --disable-shared --without-libpam --without-audit \ 
    45     --without-selinux --program-prefix=${CLFS_TARGET}- --cache-file=config.cache</userinput></screen> 
     44    --sysconfdir=$CLFS/etc --disable-shared --without-libpam \ 
     45    --without-audit --without-selinux --program-prefix=${CLFS_TARGET}- \ 
     46    --cache-file=config.cache</userinput></screen> 
    4647 
    4748    <para>Add the proper prefix to the <filename>passwd</filename> program:</para> 

  • branches/clfs-sysroot/BOOK/cross-tools/hppa/glibc-headers.xml

    r3464 r3565  
    108108    xpointer="xpointer(//*[@os='r'])"/> 
    109109 
    110 <screen os="s"><userinput>cp -v ../glibc-&glibc-version;/ports/sysdeps/unix/sysv/linux/hppa/nptl/bits/pthreadtypes.h \ 
    111     ${CLFS}/usr/include/bits</userinput></screen> 
     110<screen os="s"><userinput>cp -v \ 
     111   ../glibc-&glibc-version;/ports/sysdeps/unix/sysv/linux/hppa/nptl/bits/pthreadtypes.h \ 
     112   ${CLFS}/usr/include/bits</userinput></screen> 
    112113 
    113114  </sect2> 

  • branches/clfs-sysroot/BOOK/cross-tools/hppa/variables.xml

    r3464 r3565  
    3939  <table os="g"> 
    4040    <title>Processor Type and  Target Triplets</title> 
     41    <?dbfo table-width="5in" ?> 
     42 
    4143    <tgroup cols="2" align="center"> 
    42       <colspec colname="Processor"/> 
    43       <colspec colname="Triplet"/> 
     44 
     45      <colspec colnum="1" colwidth="2.5in" colname="Processor"/> 
     46      <colspec colnum="2" colwidth="2.5in" colname="Triplet"/> 
     47 
    4448      <thead> 
    4549        <row> 
    …… 
    4852        </row> 
    4953      </thead> 
     54 
    5055      <tbody> 
    5156        <row> 
    …… 
    6267        </row> 
    6368      </tbody> 
     69 
    6470    </tgroup> 
     71 
    6572  </table> 
    6673 

  • branches/clfs-sysroot/BOOK/cross-tools/x86/variables.xml

    r3464 r3565  
    3737  <table os="g"> 
    3838    <title>Processor Type and  Target Triplets</title> 
     39    <?dbfo table-width="5in" ?> 
     40 
    3941    <tgroup cols="2" align="center"> 
    40       <colspec colname="Processor"/> 
    41       <colspec colname="Triplet"/> 
     42 
     43      <colspec colnum="1" colwidth="2.5in" colname="Processor"/> 
     44      <colspec colnum="2" colwidth="2.5in" colname="Triplet"/> 
     45 
    4246      <thead> 
    4347        <row> 
    …… 
    4650        </row> 
    4751      </thead> 
     52 
    4853      <tbody> 
    4954        <row> 
    …… 
    6469        </row> 
    6570      </tbody> 
     71 
    6672    </tgroup> 
     73 
    6774  </table> 
    6875 

  • branches/clfs-sysroot/BOOK/final-system/common/coreutils.xml

    r3502 r3565  
    6969 
    7070<screen os="j"><userinput>mv -v ${CLFS}/usr/bin/{cat,chgrp,chmod,chown,cp,date} ${CLFS}/bin 
    71 mv -v ${CLFS}/usr/bin/{dd,df,echo,false,hostname,ln,ls,mkdir,mknod} ${CLFS}/bin 
    72 mv -v ${CLFS}/usr/bin/{mv,pwd,rm,rmdir,stty,true,uname} ${CLFS}/bin 
     71mv -v ${CLFS}/usr/bin/{dd,df,echo,false,hostname,ln,ls,mkdir} ${CLFS}/bin 
     72mv -v ${CLFS}/usr/bin/{mknod,mv,pwd,rm,rmdir,stty,true,uname} ${CLFS}/bin 
    7373mv -v ${CLFS}/usr/bin/chroot ${CLFS}/usr/sbin</userinput></screen> 
    7474 

  • branches/clfs-sysroot/BOOK/final-system/common/findutils.xml

    r3464 r3565  
    5959    scripts in the CLFS-Bootscripts package. As <filename 
    6060    class="directory">/usr</filename> may not be available during the early 
    61     stages of booting, the <command>find</command>  binary need to be on  
     61    stages of booting, the <command>find</command>  binary need to be on 
    6262    the root partition:</para> 
    6363 
    …… 
    6868 
    6969<screen os="k"><userinput>cp ${CLFS}/usr/bin/updatedb{,.orig} 
    70 sed 's@find:=${BINDIR}@find:=/bin@' ${CLFS}/usr/bin/updatedb.orig &gt; ${CLFS}/usr/bin/updatedb 
     70sed 's@find:=${BINDIR}@find:=/bin@' ${CLFS}/usr/bin/updatedb.orig &gt; \ 
     71    ${CLFS}/usr/bin/updatedb 
    7172rm ${CLFS}/usr/bin/updatedb.orig</userinput></screen> 
    7273 

  • branches/clfs-sysroot/BOOK/final-system/common/gcc.xml

    r3518 r3565  
    3737 
    3838<screen os="b"><userinput>cp libiberty/Makefile.in{,.orig} 
    39 sed 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in.orig > libiberty/Makefile.in</userinput></screen> 
     39sed 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in.orig &gt; \ 
     40    libiberty/Makefile.in</userinput></screen> 
    4041 
    4142    <para os="e1">GCC provides a <command>gccbug</command> script which detects at 
    …… 
    101102      <seglistitem> 
    102103        <seg>c++, cc (link to gcc), cpp, g++, gcc, gccbug, and gcov</seg> 
    103         <seg>libgcc.a, libgcc_eh.a, libgcc_s.so, libmudflap.[a,so],  
     104        <seg>libgcc.a, libgcc_eh.a, libgcc_s.so, libmudflap.[a,so], 
    104105        libmudflapth.[a,so], libstdc++.[a,so], and 
    105106        libsupc++.a</seg> 

  • branches/clfs-sysroot/BOOK/final-system/common/gzip.xml

    r3489 r3565  
    4141    <para os="g">Now we will move some of utilities to /usr/bin to meet FHS compliance:</para> 
    4242 
    43 <screen os="h"><userinput>mv ${CLFS}/bin/z{egrep,cmp,diff,fgrep,force,grep,less,more,new} ${CLFS}/usr/bin</userinput></screen> 
     43<screen os="h"><userinput>mv ${CLFS}/bin/z{egrep,cmp,diff,fgrep,force,grep,less,more,new} \ 
     44    ${CLFS}/usr/bin</userinput></screen> 
    4445 
    4546  </sect2> 

  • branches/clfs-sysroot/BOOK/final-system/common/m4.xml

    r3464 r3565  
    5757 
    5858      <varlistentry id="m4"> 
    59         <term><command>m4</command></term> 
     59         <!-- Don't remove the extra space, it prevet a FOP warning. --> 
     60        <term><command>m4 </command></term> 
    6061        <listitem> 
    6162          <para>copies the given files while expanding the macros that they 

  • branches/clfs-sysroot/BOOK/final-system/common/ncurses.xml

    r3464 r3565  
    4646    <para os="g">Move the Ncurses static libraries to the proper location:</para> 
    4747 
    48 <screen os="h"><userinput>mv -v ${CLFS}/lib/lib{panel,menu,form,ncurses,ncurses++,curses}.a ${CLFS}/usr/lib</userinput></screen> 
     48<screen os="h"><userinput>mv -v ${CLFS}/lib/lib{panel,menu,form,ncurses,ncurses++,curses}.a \ 
     49    ${CLFS}/usr/lib</userinput></screen> 
    4950 
    5051    <para os="i">Create symlinks in <filename class="directory">/usr/lib:</filename></para> 

  • branches/clfs-sysroot/BOOK/final-system/common/shadow.xml

    r3464 r3565  
    5858      <listitem><para>Tells Shadow to install its configuration files into 
    5959      /etc, rather than /usr/etc.</para></listitem> 
    60     </varlistentry>  
     60    </varlistentry> 
    6161    <varlistentry> 
    6262      <term><parameter>--without-libpam</parameter></term> 
    …… 
    123123 
    124124<screen role="nodump"><userinput>cp ${CLFS}/etc/login.defs login.defs.orig 
    125 sed 's@DICTPATH.*@DICTPATH\t/lib/cracklib/pw_dict@' login.defs.orig &gt; ${CLFS}/etc/login.defs</userinput></screen> 
     125sed 's@DICTPATH.*@DICTPATH\t/lib/cracklib/pw_dict@' login.defs.orig \ 
     126    &gt; ${CLFS}/etc/login.defs</userinput></screen> 
    126127    </note> 
    127128