Changeset e93718e for BOOK/final-system/common

Timestamp:

Apr 9, 2014, 1:38:17 AM (11 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

28509d8

Parents:

e8a4711 (diff), 4e977d2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'systemd' of git.cross-lfs.org:cross-lfs into systemd

File:

• BOOK/final-system/common/iproute2.xml (modified) (3 diffs)

BOOK/final-system/common/iproute2.xml

@@ -44 +44 @@
     <para os="a">Compile the package:</para>
 
-<screen os="b"><userinput>make DESTDIR= \
-    DOCDIR=/usr/share/doc/iproute2-&iproute2-version; \
-    MANDIR=/usr/share/man</userinput></screen>
+<screen os="b"><userinput>make DESTDIR= MANDIR=/usr/share/man</userinput></screen>
 
     <variablelist os="c">
@@ -61 +59 @@
         </listitem>
       </varlistentry>
-
-      <varlistentry>
-        <term><parameter>DOCDIR=/usr/share/doc/iproute2 MANDIR=/usr/share/man</parameter></term>
-        <listitem>
-          <para>The DESTDIR=/ parameter would cause documentation to be
-          installed into <filename class="directory">/share/doc</filename> and
-          <filename class="directory">/share/man</filename>. These options
-          ensure the docs are installed to the correct locations.</para>
-        </listitem>
-      </varlistentry>
     </variablelist>
 
@@ -77 +65 @@
     <para os="e">Install the package:</para>
 
-<screen os="f"><userinput>make DESTDIR= DOCDIR=/usr/share/doc/iproute2 \
+<screen os="f"><userinput>make DESTDIR= DOCDIR=/usr/share/doc/iproute2-&iproute2-version; \
     MANDIR=/usr/share/man install</userinput></screen>