Changeset c38c1fb for BOOK/final-system


Ignore:
Timestamp:
May 9, 2014, 11:35:39 AM (11 years ago)
Author:
William Harrington <kb0iic@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
2690a47
Parents:
d50634a (diff), 51bd77c4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'systemd' of cross-lfs.org:cross-lfs into systemd

Location:
BOOK/final-system
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed

  • BOOK/final-system/common/iproute2.xml

    rd50634a rc38c1fb  
    4040    <para os="a">Compile the package:</para>
    4141
    42 <screen os="b"><userinput>make DESTDIR= MANDIR=/usr/share/man</userinput></screen>
    43 
    44     <variablelist os="c">
    45       <title>The meaning of the make option:</title>
    46 
    47       <varlistentry>
    48         <term><parameter>DESTDIR=</parameter></term>
    49         <listitem>
    50           <para>This option overrides the default DESTDIR of /usr, so that
    51           that the IPRoute2 binaries will be installed into
    52           <filename class="directory">/sbin</filename>. This is the correct
    53           location according to the FHS, as some of these programs may be
    54           needed before <filename class="directory">/usr</filename> is available.</para>
    55         </listitem>
    56       </varlistentry>
    57     </variablelist>
    58 
    59     <para os="d">This package does not come with a test suite.</para>
    60 
    61     <para os="e">Install the package:</para>
    62 
    63 <screen os="f"><userinput>make DESTDIR= DOCDIR=/usr/share/doc/iproute2-&iproute2-version; \
    64     MANDIR=/usr/share/man install</userinput></screen>
     42<screen os="b"><userinput>make</userinput></screen>
     43
     44    <para os="c">This package does not come with a test suite.</para>
     45
     46    <para os="d">Install the package:</para>
     47
     48<screen os="e"><userinput>make DOCDIR=/usr/share/doc/iproute2-&iproute2-version; install</userinput></screen>
    6549
    6650  </sect2>

  • BOOK/final-system/mips64-chapter.xml

    rd50634a rc38c1fb  
    105105  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext-n32.xml"/>
    106106  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext-64bit.xml"/>
    107   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
     107  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gperf.xml"/>
    108108  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
    109109  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/groff.xml"/>

  • BOOK/final-system/multilib/iproute2.xml

    rd50634a rc38c1fb  
    3838    xpointer="xpointer(//*[@os='a'])"/>
    3939
    40 <screen os="b"><userinput>make CC="gcc ${BUILD64}" DESTDIR= \
    41     LIBDIR=/usr/lib64 MANDIR=/usr/share/man</userinput></screen>
     40<screen os="b"><userinput>make CC="gcc ${BUILD64}" LIBDIR=/usr/lib64</userinput></screen>
    4241
    4342    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    4948    xpointer="xpointer(//*[@os='d'])"/>
    5049
    51     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    52     href="../common/iproute2.xml"
    53     xpointer="xpointer(//*[@os='e'])"/>
    54 
    55 <screen os="f"><userinput>make DESTDIR= LIBDIR=/usr/lib64 \
    56     DOCDIR=/usr/share/doc/iproute2-&iproute2-version; \
    57     MANDIR=/usr/share/man install</userinput></screen>
     50<screen os="e"><userinput>make LIBDIR=/usr/lib64 \
     51    DOCDIR=/usr/share/doc/iproute2-&iproute2-version; install</userinput></screen>
    5852
    5953  </sect2>

  • BOOK/final-system/ppc64-chapter.xml

    rd50634a rc38c1fb  
    8282  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext.xml"/>
    8383  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext-64bit.xml"/>
    84   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
     84  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gperf.xml"/>
    8585  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
    8686  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/groff.xml"/>
    … …  
    9090  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kbd.xml"/>
    9191  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libpipeline.xml"/>
    92   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libpipeline-n32.xml"/>
    9392  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libpipeline-64bit.xml"/>
    9493  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>

  • BOOK/final-system/sparc64-chapter.xml

    rd50634a rc38c1fb  
    8282  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext.xml"/>
    8383  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext-64bit.xml"/>
    84   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
     84  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gperf.xml"/>
    8585  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
    8686  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/groff.xml"/>
    … …  
    9090  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kbd.xml"/>
    9191  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libpipeline.xml"/>
    92   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libpipeline-n32.xml"/>
    9392  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libpipeline-64bit.xml"/>
    9493  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>

  • BOOK/final-system/x86_64-chapter.xml

    rd50634a rc38c1fb  
    8282  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext.xml"/>
    8383  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext-64bit.xml"/>
    84   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
     84  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gperf.xml"/>
    8585  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
    8686  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/groff.xml"/>
    … …  
    9090  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kbd.xml"/>
    9191  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libpipeline.xml"/>
    92   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libpipeline-n32.xml"/>
    9392  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libpipeline-64bit.xml"/>
    9493  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
Note: See TracChangeset for help on using the changeset viewer.