Changeset ba9a546 for chapter06

Timestamp:

07/06/2014 06:20:40 PM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

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

Children:

63e8d0a

Parents:

346eaef1

Message:

Merge lfs svn, dbus 1.8.6 update, fix md5sums repored by spiky.

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

Location:

chapter06

Files:

• binutils.xml (modified) (1 diff)
• iproute2.xml (modified) (2 diffs)
• vim.xml (modified) (2 diffs)

chapter06/binutils.xml

@@ -78 +78 @@
     <para>Prepare Binutils for compilation:</para>
 
-<screen><userinput remap="configure">../binutils-&binutils-version;/configure --prefix=/usr  \
-                          --enable-shared \
-                          --disable-werror</userinput></screen>
+<screen><userinput remap="configure">../binutils-&binutils-version;/configure --prefix=/usr   \
+                           --enable-shared \
+                           --disable-werror</userinput></screen>
 
     <para>Compile the package:</para>

chapter06/iproute2.xml

@@ -61 +61 @@
     <para>Compile the package:</para>
 
-<screen><userinput remap="make">make DESTDIR=</userinput></screen>
-
-    <variablelist>
-      <title>The meaning of the make option:</title>
-
-      <varlistentry>
-        <term><parameter>DESTDIR=</parameter></term>
-        <listitem>
-          <para>This ensures that the IPRoute2 binaries will install into
-          the correct directory. By default, <parameter>DESTDIR</parameter> is
-          set to <filename class="directory">/usr</filename>.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
+<screen><userinput remap="make">make</userinput></screen>
 
     <para>This package comes with a test suite, but due to assumptions it makes,
@@ -88 +74 @@
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make DESTDIR=              \
-     MANDIR=/usr/share/man \
-     DOCDIR=/usr/share/doc/iproute2-&iproute2-version; install</userinput></screen>
+<screen><userinput remap="install">make DOCDIR=/usr/share/doc/iproute2-&iproute2-version; install</userinput></screen>
 
   </sect2>

chapter06/vim.xml

@@ -84 +84 @@
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make install</userinput></screen>
+<screen><userinput remap="install">make HELPSUBLOC=/usr/share/doc/vim-&vim-version; install</userinput></screen>
+
+    <variablelist>
+      <title>The meaning of the make option:</title>
+
+      <varlistentry>
+        <term><parameter>HELPSUBLOC=/usr/share/doc/vim-&vim-version;</parameter></term>
+        <listitem>
+          <para>Tells Vim to install its documentation into
+          <filename class="directory">/usr/share/doc/vim-&vim-version;</filename>
+          instead of 
+          <filename class="directory">/usr/share/&vim-docdir;/doc</filename>,
+          for better consistency with the documentation location for other
+          packages.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
 
     <para>Many users are used to using <command>vi</command> instead of
@@ -96 +113 @@
     ln -sv vim.1 $(dirname $L)/vi.1
 done</userinput></screen>
-
-    <para>By default, Vim's documentation is installed in <filename
-    class="directory">/usr/share/vim</filename>. The following symlink
-    allows the documentation to be accessed via <filename
-    class="directory">/usr/share/doc/vim-&vim-version;</filename>, making
-    it consistent with the location of documentation for other packages:</para>
-
-<screen><userinput remap="install">ln -sv ../&vim-docdir;/doc /usr/share/doc/vim-&vim-version;</userinput></screen>
 
     <para>If an X Window System is going to be installed on the LFS