Changes in / [e93718e:e8a4711]

Location:

BOOK/final-system

Files:

• common/iproute2.xml (modified) (3 diffs)
• multilib/iproute2.xml (modified) (2 diffs)

BOOK/final-system/common/iproute2.xml

@@ -44 +44 @@
     <para os="a">Compile the package:</para>
 
-<screen os="b"><userinput>make DESTDIR= MANDIR=/usr/share/man</userinput></screen>
+<screen os="b"><userinput>make DESTDIR= \
+    DOCDIR=/usr/share/doc/iproute2-&iproute2-version; \
+    MANDIR=/usr/share/man</userinput></screen>
 
     <variablelist os="c">
@@ -59 +61 @@
         </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>
 
@@ -65 +77 @@
     <para os="e">Install the package:</para>
 
-<screen os="f"><userinput>make DESTDIR= DOCDIR=/usr/share/doc/iproute2-&iproute2-version; \
+<screen os="f"><userinput>make DESTDIR= DOCDIR=/usr/share/doc/iproute2 \
     MANDIR=/usr/share/man install</userinput></screen>
 

BOOK/final-system/multilib/iproute2.xml

@@ -47 +47 @@
 
 <screen os="b"><userinput>make CC="gcc ${BUILD64}" DESTDIR= \
-    LIBDIR=/usr/lib64 MANDIR=/usr/share/man</userinput></screen>
+    LIBDIR=/usr/lib64 \
+    DOCDIR=/usr/share/doc/iproute2-&iproute2-version; \
+    MANDIR=/usr/share/man</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -62 +64 @@
 
 <screen os="f"><userinput>make DESTDIR= LIBDIR=/usr/lib64 \
-    DOCDIR=/usr/share/doc/iproute2-&iproute2-version; \
+    DOCDIR=/usr/share/doc/iproute2 \
     MANDIR=/usr/share/man install</userinput></screen>