From 4622193e8e3034bb1647ac05a1074ec61748c20a Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@mengyan1223.wang>
Date: Wed, 27 Jan 2021 04:43:14 +0000
Subject: libcap: make the installation like other packages

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@12102 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter08/libcap.xml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/chapter08/libcap.xml b/chapter08/libcap.xml
index fc3335f25..f3b6c0074 100644
--- a/chapter08/libcap.xml
+++ b/chapter08/libcap.xml
@@ -49,7 +49,7 @@
 
     <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>
       <title>The meaning of the make option:</title>
@@ -58,8 +58,8 @@
         <term><parameter>lib=lib</parameter></term>
         <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>
       </varlistentry>
@@ -69,13 +69,14 @@
 
 <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
-    chmod -v 755 /lib/lib${libname}.so.&libcap-version;
-    rm -v /lib/lib${libname}.so
+    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;
 done</userinput></screen>
 
   </sect2>
-- 
cgit v1.2.3-54-g00ecf