diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 9c20d957f..85e0050aa 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -35,6 +35,17 @@ --> + + 2013-12-07 + + + [bdubbs] - Fix location of binaries and libraries + for kmod and xz. Fixes + #3443. + + + + 2013-11-23 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 @@ ./configure --prefix=/usr \ --bindir=/bin \ - --libdir=/lib \ --sysconfdir=/etc \ --disable-manpages \ --with-xz \ @@ -81,10 +80,11 @@ make check 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: -make pkgconfigdir=/usr/lib/pkgconfig 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 + Make sure that all libraries are in the correct directory: + +mv -v /usr/lib/libkmod.so.* /lib +ln -svf ../../lib/libkmod.so.2.2.4 /usr/lib/libkmod.so + + + 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 @@ Prepare Xz for compilation with: -./configure --prefix=/usr --libdir=/lib --docdir=/usr/share/doc/xz-&xz-version; +./configure --prefix=/usr \ + --bindir=/bin \ + --docdir=/usr/share/doc/xz-&xz-version; Compile the package: @@ -56,9 +58,12 @@ make check - Install the package: + Install the package and make sure that all libraries are in the + correct directory: -make pkgconfigdir=/usr/lib/pkgconfig install +make install +mv -v /usr/lib/liblzma.so.* /lib +ln -svf ../../lib/liblzma.so.&xz-version; /usr/lib/liblzma.so diff --git a/general.ent b/general.ent index 7ca24a530..f0b79240a 100644 --- a/general.ent +++ b/general.ent @@ -1,5 +1,5 @@ - - + +