[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, systemd, updated. clfs-2.1.0-987-g62f6590

[git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".

The branch, systemd has been updated
       via  62f659087ede0b6802425272a836103ccacedc89 (commit)
      from  6ead20fdd5956cccafcf7acb0114e996d422c54c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 62f659087ede0b6802425272a836103ccacedc89
Author: Chris Staub <chris at beaker67.com>
Date:   Sat May 10 00:10:44 2014 -0400

    Removed unneeded DESTDIR and MANDIR from iproute2 instructions

diff --git a/BOOK/final-system/common/iproute2.xml b/BOOK/final-system/common/iproute2.xml
index 22bb265..780eaf7 100644
--- a/BOOK/final-system/common/iproute2.xml
+++ b/BOOK/final-system/common/iproute2.xml
@@ -39,29 +39,13 @@ sed -i 's/arpd.8//' man/man8/Makefile</userinput></screen>
 
     <para os="a">Compile the package:</para>
 
-<screen os="b"><userinput>make DESTDIR= MANDIR=/usr/share/man</userinput></screen>
+<screen os="b"><userinput>make</userinput></screen>
 
-    <variablelist os="c">
-      <title>The meaning of the make option:</title>
+    <para os="c">This package does not come with a test suite.</para>
 
-      <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>
+    <para os="d">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="e"><userinput>make DOCDIR=/usr/share/doc/iproute2-&iproute2-version; install</userinput></screen>
 
   </sect2>
 
diff --git a/BOOK/final-system/multilib/iproute2.xml b/BOOK/final-system/multilib/iproute2.xml
index 713b045..63d5ffe 100644
--- a/BOOK/final-system/multilib/iproute2.xml
+++ b/BOOK/final-system/multilib/iproute2.xml
@@ -37,8 +37,7 @@
     href="../common/iproute2.xml"
     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"
     href="../common/iproute2.xml"
@@ -48,13 +47,8 @@
     href="../common/iproute2.xml"
     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>
 

-----------------------------------------------------------------------

Summary of changes:
 BOOK/final-system/common/iproute2.xml   |   24 ++++--------------------
 BOOK/final-system/multilib/iproute2.xml |   12 +++---------
 2 files changed, 7 insertions(+), 29 deletions(-)


hooks/post-receive
-- 
Cross-LFS Book