Changeset 69ae77b for BOOK/final-system/multilib

Timestamp:

Dec 7, 2015, 4:33:35 AM (9 years ago)

Author:

Chris Staub <chris@…>

Branches:

master, systemd

Children:

93adfd5f

Parents:

fc19382 (diff), fe23bd1 (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 'master' of clfs.org:cross-lfs

Location:

BOOK/final-system/multilib

Files:

• procps-ng-64bit.xml (modified) (1 diff)
• procps-ng-n32.xml (modified) (1 diff)
• procps-ng.xml (modified) (1 diff)

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

@@ -62 +62 @@
     xpointer="xpointer(//*[@os='j'])"/>
 
-<screen os="k"><userinput>mv -v /usr/bin/pidof /bin
-mv -v /usr/lib64/libprocps.so.* /lib64
+<screen os="k"><userinput>mv -v /usr/lib64/libprocps.so.* /lib64
 ln -sfv ../../lib64/$(readlink /usr/lib64/libprocps.so) /usr/lib64/libprocps.so</userinput></screen>
 

BOOK/final-system/multilib/procps-ng-n32.xml

@@ -63 +63 @@
     xpointer="xpointer(//*[@os='j'])"/>
 
-<screen os="k"><userinput>mv -v /usr/bin/pidof /bin
-mv -v /usr/lib32/libprocps.so.* /lib32
+<screen os="k"><userinput>mv -v /usr/lib32/libprocps.so.* /lib32
 ln -sfv ../../lib32/$(readlink /usr/lib32/libprocps.so) /usr/lib32/libprocps.so</userinput></screen>
 

BOOK/final-system/multilib/procps-ng.xml

@@ -67 +67 @@
     xpointer="xpointer(//*[@os='j'])"/>
 
-<screen os="k"><userinput>mv -v /usr/bin/pidof /bin
-mv -v /usr/lib/libprocps.so.* /lib
+<screen os="k"><userinput>mv -v /usr/lib/libprocps.so.* /lib
 ln -sfv ../../lib/$(readlink /usr/lib/libprocps.so) /usr/lib/libprocps.so</userinput></screen>