Changeset 5e06d04 for chapter08/libcap.xml

Timestamp:

02/01/2021 08:37:19 AM (3 years ago)

Author:

Thomas Trepl <thomas@…>

Branches:

multilib-10.1

Children:

f695e02

Parents:

3e73c5d

Message:

Merge changes from trunk to multilib

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/multilib@12107 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

File:

• chapter08/libcap.xml (modified) (3 diffs)

chapter08/libcap.xml

@@ -50 +50 @@
     <para>Compile the package:</para>
 
-<screen><userinput remap="make">make lib=lib</userinput></screen>
+<screen><userinput remap="make">make prefix=/usr lib=lib</userinput></screen>
 
     <variablelist>
@@ -59 +59 @@
         <listitem>
           <para>This parameter sets the library directory to
-          <filename>/lib</filename> rather than
-          <filename>/lib64</filename> on x86_64. It has no effect on
+          <filename>/usr/lib</filename> rather than
+          <filename>/usr/lib64</filename> on x86_64. It has no effect on
           x86.</para>
         </listitem>
@@ -70 +70 @@
 <screen><userinput remap="test">make test</userinput></screen>
 
-    <para>Install the package and do some cleanup:</para>
-
-<screen><userinput remap="install">make lib=lib PKGCONFIGDIR=/usr/lib/pkgconfig install
+    <para>Install the package and make sure the essential libraries are in
+    the correct directory:</para>
+
+<screen><userinput remap="install">make prefix=/usr lib=lib install
 for libname in cap psx; do
+    mv -v /usr/lib/lib${libname}.so.* /lib
+    ln -sfv ../../lib/lib${libname}.so.2 /usr/lib/lib${libname}.so
     chmod -v 755 /lib/lib${libname}.so.&libcap-version;
-    rm -v /lib/lib${libname}.so
-    ln -sfv ../../lib/lib${libname}.so.2 /usr/lib/lib${libname}.so
 done</userinput></screen>