Changeset 4622193e

Timestamp:

01/27/2021 04:43:14 AM (4 years ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 12.2, 12.2-rc1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/loongarch-12.2, xry111/mips64el, xry111/multilib, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

742c6324

Parents:

8850677

Message:

libcap: make the installation like other packages

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/trunk/BOOK@12102 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>
+    <para>Install the package and make sure the essential libraries are in
+    the correct directory:</para>
 
-<screen><userinput remap="install">make lib=lib PKGCONFIGDIR=/usr/lib/pkgconfig install
+<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>