[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, systemd, updated. clfs-2.1.0-660-ga7c0853

[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  a7c08538881d834dff3bb0e40e8f410102c17180 (commit)
      from  9c7ff082f1dcf4fba9d39eed2ad7a6c230de9907 (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 a7c08538881d834dff3bb0e40e8f410102c17180
Author: William Harrington <kb0iic at cross-lfs.org>
Date:   Tue Apr 8 22:36:43 2014 -0500

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

diff --git a/BOOK/final-system/common/iproute2.xml b/BOOK/final-system/common/iproute2.xml
index cef350f..f9c70d4 100644
--- a/BOOK/final-system/common/iproute2.xml
+++ b/BOOK/final-system/common/iproute2.xml
@@ -43,9 +43,7 @@ sed -i 's/arpd.8//' man/man8/Makefile</userinput></screen>
 
     <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">
       <title>The meaning of the make option:</title>
@@ -62,7 +60,7 @@ sed -i 's/arpd.8//' man/man8/Makefile</userinput></screen>
       </varlistentry>
 
       <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
           installed into <filename class="directory">/share/doc</filename> and
@@ -76,7 +74,7 @@ sed -i 's/arpd.8//' man/man8/Makefile</userinput></screen>
 
     <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>
 
   </sect2>
diff --git a/BOOK/final-system/multilib/iproute2.xml b/BOOK/final-system/multilib/iproute2.xml
index be4f151..205fdf8 100644
--- a/BOOK/final-system/multilib/iproute2.xml
+++ b/BOOK/final-system/multilib/iproute2.xml
@@ -46,9 +46,7 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <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"
     href="../common/iproute2.xml"
@@ -63,7 +61,7 @@
     xpointer="xpointer(//*[@os='e'])"/>
 
 <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>
 
   </sect2>

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

Summary of changes:
 BOOK/final-system/common/iproute2.xml   |    8 +++-----
 BOOK/final-system/multilib/iproute2.xml |    6 ++----
 2 files changed, 5 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
Cross-LFS Book