Changeset 026bb5d for BOOK/final-system/multilib/procps-64bit.xml

Timestamp:

Dec 18, 2013, 1:04:00 AM (11 years ago)

Author:

Chris Staub <chris@…>

Children:

f975b3a

Parents:

1c9985f (diff), 8abef998 (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:

Updated simp branch to match main book

File:

• BOOK/final-system/multilib/procps-64bit.xml (modified) (2 diffs)

BOOK/final-system/multilib/procps-64bit.xml

@@ -32 +32 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/procps.xml"
+    xpointer="xpointer(//*[@os='p3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/procps.xml"
+    xpointer="xpointer(//*[@os='p4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/procps.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
 
@@ -52 +60 @@
     xpointer="xpointer(//*[@os='d'])"/>
 
-<screen os="e"><userinput>make install lib64=lib64</userinput></screen>
+<screen os="e"><userinput>make SKIP='/bin/kill /usr/share/man/man1/kill.1' install lib64=lib64</userinput></screen>
 
     <variablelist os="f">