Changeset 62f6590

Timestamp:

May 9, 2014, 9:10:44 PM (11 years ago)

Author:

Chris Staub <chris@…>

Branches:

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

Children:

ce067a0

Parents:

6ead20f

Message:

Removed unneeded DESTDIR and MANDIR from iproute2 instructions

Location:

BOOK/final-system

Files:

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

BOOK/final-system/common/iproute2.xml

@@ -40 +40 @@
     <para os="a">Compile the package:</para>
 
-<screen os="b"><userinput>make DESTDIR= MANDIR=/usr/share/man</userinput></screen>
-
-    <variablelist os="c">
-      <title>The meaning of the make option:</title>
-
-      <varlistentry>
-        <term><parameter>DESTDIR=</parameter></term>
-        <listitem>
-          <para>This option overrides the default DESTDIR of /usr, so that
-          that the IPRoute2 binaries will be installed into
-          <filename class="directory">/sbin</filename>. This is the correct
-          location according to the FHS, as some of these programs may be
-          needed before <filename class="directory">/usr</filename> is available.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <para os="d">This package does not come with a test suite.</para>
-
-    <para os="e">Install the package:</para>
-
-<screen os="f"><userinput>make DESTDIR= DOCDIR=/usr/share/doc/iproute2-&iproute2-version; \
-    MANDIR=/usr/share/man install</userinput></screen>
+<screen os="b"><userinput>make</userinput></screen>
+
+    <para os="c">This package does not come with a test suite.</para>
+
+    <para os="d">Install the package:</para>
+
+<screen os="e"><userinput>make DOCDIR=/usr/share/doc/iproute2-&iproute2-version; install</userinput></screen>
 
   </sect2>

BOOK/final-system/multilib/iproute2.xml

@@ -38 +38 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>make CC="gcc ${BUILD64}" DESTDIR= \
-    LIBDIR=/usr/lib64 MANDIR=/usr/share/man</userinput></screen>
+<screen os="b"><userinput>make CC="gcc ${BUILD64}" LIBDIR=/usr/lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -49 +48 @@
     xpointer="xpointer(//*[@os='d'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/iproute2.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-<screen os="f"><userinput>make DESTDIR= LIBDIR=/usr/lib64 \
-    DOCDIR=/usr/share/doc/iproute2-&iproute2-version; \
-    MANDIR=/usr/share/man install</userinput></screen>
+<screen os="e"><userinput>make LIBDIR=/usr/lib64 \
+    DOCDIR=/usr/share/doc/iproute2-&iproute2-version; install</userinput></screen>
 
   </sect2>