Changeset a7c0853

Timestamp:

Apr 8, 2014, 8:36:43 PM (11 years ago)

Author:

William Harrington <kb0iic@…>

Branches:

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

Children:

6b5c3ff7

Parents:

9c7ff08

Message:

Remove DOCDIR from build command and add version to make install DOCDIR variable.

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= \
-    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">
@@ -63 +61 @@
 
       <varlistentry>
-        <term><parameter>DOCDIR=/usr/share/doc/iproute2 MANDIR=/usr/share/man</parameter></term>
+        <term><parameter>DOCDIR=/usr/share/doc/iproute2-&iproute2-version; MANDIR=/usr/share/man</parameter></term>
         <listitem>
           <para>The DESTDIR=/ parameter would cause documentation to be
@@ -77 +75 @@
     <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>
 

BOOK/final-system/multilib/iproute2.xml

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