Fix location of binaries and libraries for kmod and xz.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10382 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

4 files changed, 32 insertions, 8 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 9c20d957f..85e0050aa 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,17 @@
     </listitem>
 -->
     <listitem>
+      <para>2013-12-07</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Fix location of binaries and libraries 
+          for kmod and xz.  Fixes
+          <ulink url="&lfs-ticket-root;3443">#3443</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2013-11-23</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter06/kmod.xml b/chapter06/kmod.xml
index c1bd05224..9c06ef64f 100644
--- a/chapter06/kmod.xml
+++ b/chapter06/kmod.xml
@@ -45,7 +45,6 @@
 
 <screen><userinput remap="configure">./configure --prefix=/usr       \
             --bindir=/bin       \
-            --libdir=/lib       \
             --sysconfdir=/etc   \
             --disable-manpages  \
             --with-xz           \
@@ -81,10 +80,11 @@
 <screen><userinput remap="test">make check</userinput></screen>
 
     <para>Install the package, and create symlinks for compatibility with
-    Module-Init-Tools, the package that previously handled Linux kernel modules:
+    Module-Init-Tools, the package that previously handled Linux kernel modules.
+    Also make sure that all libraries are in the correct directory:
     </para>
 
-<screen><userinput remap="install">make pkgconfigdir=/usr/lib/pkgconfig install
+<screen><userinput remap="install">make install
 
 for target in depmod insmod modinfo modprobe rmmod; do
   ln -sv ../bin/kmod /sbin/$target
@@ -92,6 +92,14 @@ done
 
 ln -sv kmod /bin/lsmod</userinput></screen>
 
+    <para> Make sure that all libraries are in the correct directory: </para>
+
+<screen><userinput remap="install">mv -v /usr/lib/libkmod.so.* /lib
+ln -svf ../../lib/libkmod.so.2.2.4 /usr/lib/libkmod.so</userinput></screen>
+
+<!-- Note to editors:  When upgrading kmod, make sure the library version
+     specified above has not changed -->
+
   </sect2>
 
   <sect2 id="contents-kmod" role="content">
diff --git a/chapter06/xz.xml b/chapter06/xz.xml
index dd927d179..a44bd10cd 100644
--- a/chapter06/xz.xml
+++ b/chapter06/xz.xml
@@ -46,7 +46,9 @@
 
     <para>Prepare Xz for compilation with:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr --libdir=/lib --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr \
+            --bindir=/bin \
+            --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
 
     <para>Compile the package:</para>
 
@@ -56,9 +58,12 @@
 
 <screen><userinput remap="test">make check</userinput></screen>
 
-  <para>Install the package:</para>
+  <para>Install the package and make sure that all libraries are in the
+  correct directory:</para>
 
-<screen><userinput remap="install">make pkgconfigdir=/usr/lib/pkgconfig install</userinput></screen>
+<screen><userinput remap="install">make install
+mv -v /usr/lib/liblzma.so.* /lib
+ln -svf ../../lib/liblzma.so.&xz-version; /usr/lib/liblzma.so</userinput></screen>
 
   </sect2>
 
diff --git a/general.ent b/general.ent
index 7ca24a530..f0b79240a 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version         "SVN-20131123">
-<!ENTITY releasedate     "November 23, 2013">
+<!ENTITY version         "SVN-20131207">
+<!ENTITY releasedate     "December 7, 2013">
 <!ENTITY copyrightdate   "1999-2013"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.5">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->