Changeset e93718e


Ignore:
Timestamp:
Apr 9, 2014, 1:38:17 AM (11 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
28509d8
Parents:
e8a4711 (diff), 4e977d2 (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 git.cross-lfs.org:cross-lfs into systemd

Location:
BOOK/final-system
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    re8a4711 re93718e  
    4444    <para os="a">Compile the package:</para>
    4545
    46 <screen os="b"><userinput>make DESTDIR= \
    47     DOCDIR=/usr/share/doc/iproute2-&iproute2-version; \
    48     MANDIR=/usr/share/man</userinput></screen>
     46<screen os="b"><userinput>make DESTDIR= MANDIR=/usr/share/man</userinput></screen>
    4947
    5048    <variablelist os="c">
    … …  
    6159        </listitem>
    6260      </varlistentry>
    63 
    64       <varlistentry>
    65         <term><parameter>DOCDIR=/usr/share/doc/iproute2 MANDIR=/usr/share/man</parameter></term>
    66         <listitem>
    67           <para>The DESTDIR=/ parameter would cause documentation to be
    68           installed into <filename class="directory">/share/doc</filename> and
    69           <filename class="directory">/share/man</filename>. These options
    70           ensure the docs are installed to the correct locations.</para>
    71         </listitem>
    72       </varlistentry>
    7361    </variablelist>
    7462
    … …  
    7765    <para os="e">Install the package:</para>
    7866
    79 <screen os="f"><userinput>make DESTDIR= DOCDIR=/usr/share/doc/iproute2 \
     67<screen os="f"><userinput>make DESTDIR= DOCDIR=/usr/share/doc/iproute2-&iproute2-version; \
    8068    MANDIR=/usr/share/man install</userinput></screen>
    8169

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

    re8a4711 re93718e  
    4747
    4848<screen os="b"><userinput>make CC="gcc ${BUILD64}" DESTDIR= \
    49     LIBDIR=/usr/lib64 \
    50     DOCDIR=/usr/share/doc/iproute2-&iproute2-version; \
    51     MANDIR=/usr/share/man</userinput></screen>
     49    LIBDIR=/usr/lib64 MANDIR=/usr/share/man</userinput></screen>
    5250
    5351    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    6462
    6563<screen os="f"><userinput>make DESTDIR= LIBDIR=/usr/lib64 \
    66     DOCDIR=/usr/share/doc/iproute2 \
     64    DOCDIR=/usr/share/doc/iproute2-&iproute2-version; \
    6765    MANDIR=/usr/share/man install</userinput></screen>
    6866
Note: See TracChangeset for help on using the changeset viewer.