Changeset 7e1a1f8 for chapter06

Timestamp:

08/15/2014 10:29:35 AM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

7.6-systemd, 7.7-systemd, 7.8-systemd, 7.9-systemd

Children:

e7848c3

Parents:

46d06d9

Message:

Merged trunk.

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/systemd/BOOK@10691 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Location:

chapter06

Files:

• util-linux.xml (modified) (2 diffs)
• vim.xml (modified) (1 diff)

chapter06/util-linux.xml

@@ -58 +58 @@
     <para>Prepare Util-linux for compilation:</para>
 
-<screen><userinput remap="configure">./configure ADJTIME_PATH=/var/lib/hwclock</userinput></screen>
+<screen><userinput remap="configure">./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \
+    --docdir=/usr/share/doc/util-linx-&util-linux-version;</userinput></screen>
 
     <para>Compile the package:</para>
@@ -111 +112 @@
 
         <seg>/etc/terminal-colors.d, /usr/include/blkid, /usr/include/libmount, 
-        /usr/include/uuid, /usr/share/doc/util-linux/getopt, /var/lib/hwclock</seg>
+        /usr/include/uuid, /usr/share/doc/util-linux-&util-linux-version;/getopt, /var/lib/hwclock</seg>
       </seglistitem>
     </segmentedlist>

chapter06/vim.xml

@@ -51 +51 @@
     <para>Prepare Vim for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr --enable-multibyte</userinput></screen>
-
-    <variablelist>
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry>
-        <term><parameter>--enable-multibyte</parameter></term>
-        <listitem>
-          <para>This switch enables support for editing files in multibyte
-          character encodings. This is needed if using a locale with a
-          multibyte character set. This switch is also helpful to be able
-          to edit text files initially created in Linux distributions like
-          Fedora that use UTF-8 as a default character set.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
+<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
 
     <para>Compile the package:</para>