Changeset e93718e for BOOK/final-system/multilib

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

File:

• BOOK/final-system/multilib/iproute2.xml (modified) (2 diffs)

BOOK/final-system/multilib/iproute2.xml

@@ -47 +47 @@
 
 <screen os="b"><userinput>make CC="gcc ${BUILD64}" DESTDIR= \
-    LIBDIR=/usr/lib64 \
-    DOCDIR=/usr/share/doc/iproute2-&iproute2-version; \
-    MANDIR=/usr/share/man</userinput></screen>
+    LIBDIR=/usr/lib64 MANDIR=/usr/share/man</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -64 +62 @@
 
 <screen os="f"><userinput>make DESTDIR= LIBDIR=/usr/lib64 \
-    DOCDIR=/usr/share/doc/iproute2 \
+    DOCDIR=/usr/share/doc/iproute2-&iproute2-version; \
     MANDIR=/usr/share/man install</userinput></screen>