Changeset c38c1fb for BOOK/final-system/multilib

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/multilib

Files:

• gperf.xml (added)
• iproute2.xml (modified) (2 diffs)

BOOK/final-system/multilib/iproute2.xml

@@ -38 +38 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>make CC="gcc ${BUILD64}" DESTDIR= \
-    LIBDIR=/usr/lib64 MANDIR=/usr/share/man</userinput></screen>
+<screen os="b"><userinput>make CC="gcc ${BUILD64}" LIBDIR=/usr/lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -49 +48 @@
     xpointer="xpointer(//*[@os='d'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/iproute2.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-<screen os="f"><userinput>make DESTDIR= LIBDIR=/usr/lib64 \
-    DOCDIR=/usr/share/doc/iproute2-&iproute2-version; \
-    MANDIR=/usr/share/man install</userinput></screen>
+<screen os="e"><userinput>make LIBDIR=/usr/lib64 \
+    DOCDIR=/usr/share/doc/iproute2-&iproute2-version; install</userinput></screen>
 
   </sect2>