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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • 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>
Note: See TracChangeset for help on using the changeset viewer.