aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06
diff options
context:
space:
mode:
authorKrejzi <krejzi@linuxfromscratch.org>2014-02-26 14:50:40 +0000
committerKrejzi <krejzi@linuxfromscratch.org>2014-02-26 14:50:40 +0000
commit2925b3cb9d7e78dc7e4bcd8873727a1cf9bcba6f (patch)
tree3bb5d7599d591312afc08208a85f347182c94da1 /chapter06
parent9c85c933458ebc848a4fa3bfd93e1c90bcb7f432 (diff)
Merge some minor stuff from LFS, remove unnecesary command from dbus command explanations and misc fixes.
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd/BOOK@10492 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter06')
-rw-r--r--chapter06/dbus.xml8
-rw-r--r--chapter06/gawk.xml3
-rw-r--r--chapter06/gcc.xml3
-rw-r--r--chapter06/kmod.xml14
4 files changed, 10 insertions, 18 deletions
diff --git a/chapter06/dbus.xml b/chapter06/dbus.xml
index 9fae7b1aa..ae06c4453 100644
--- a/chapter06/dbus.xml
+++ b/chapter06/dbus.xml
@@ -58,14 +58,6 @@
<title>The meaning of the configure options:</title>
<varlistentry>
- <term><parameter>--enable-systemd</parameter></term>
- <listitem>
- <para>This enables support for authentication check using
- Systemd Logind.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
<term><parameter>--with-console-auth-dir=/run/console</parameter></term>
<listitem>
<para>This specifies the location of the ConsoleKit auth
diff --git a/chapter06/gawk.xml b/chapter06/gawk.xml
index 1ca55fccd..81e572172 100644
--- a/chapter06/gawk.xml
+++ b/chapter06/gawk.xml
@@ -76,7 +76,8 @@ cp -v doc/{awkforai.txt,*.{eps,pdf,jpg}} /usr/share/doc/gawk-&gawk-version;</
<seg>filefuncs.so, fnmatch.so, fork.so, inplace.so, ordchr.so,
readdir.so, readfile.so, revoutput.so, revtwoway.so, rwarray.so,
testext.so, and time.so</seg>
- <seg>/usr/lib/gawk, /usr/libexec/awk, /usr/share/awk, /usr/share/doc/gawk-&gawk-version;</seg>
+ <seg>/usr/lib/gawk, /usr/libexec/awk, /usr/share/awk,
+ /usr/share/doc/gawk-&gawk-version;</seg>
</seglistitem>
</segmentedlist>
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 0398d2bfd..1484f4ff5 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -320,7 +320,8 @@ mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
libquadmath.{a,so}, libssp.{a,so},
libssp_nonshared.a, libstdc++.{a,so}, libsupc++.a and libtsan.{a,so}</seg>
- <seg>/usr/include/c++, /usr/lib/gcc, /usr/libexec/gcc, /usr/share/gcc-&gcc-version;</seg>
+ <seg>/usr/include/c++, /usr/lib/gcc, /usr/libexec/gcc,
+ /usr/share/gcc-&gcc-version;</seg>
</seglistitem>
</segmentedlist>
diff --git a/chapter06/kmod.xml b/chapter06/kmod.xml
index 063433040..06a1e19bb 100644
--- a/chapter06/kmod.xml
+++ b/chapter06/kmod.xml
@@ -88,21 +88,19 @@
<screen><userinput remap="test">make check</userinput></screen>
- <para>Install the package, create symlinks for compatibility with
- Module-Init-Tools (the package that previously handled Linux kernel
- modules), and manually install the man pages. Also make sure that all
- libraries are in the correct directory: </para>
+ <para>Install the package, man pages, and create symlinks for
+ compatibility with 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 install
+make -C man install
for target in depmod insmod modinfo modprobe rmmod; do
ln -sv ../bin/kmod /sbin/$target
done
-ln -sv kmod /bin/lsmod
-
-cp -v man/*.5 /usr/share/man/man5
-cp -v man/*.8 /usr/share/man/man8</userinput></screen>
+ln -sv kmod /bin/lsmod</userinput></screen>
</sect2>