[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. clfs-2.1.0-1315-g3bdce0d

[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, master has been updated
       via  3bdce0d0f02b5103458613c67f2e8a2fdf31e39d (commit)
       via  285a4d045654081a3cef5c79f73ef9937198fb6e (commit)
      from  837a445332ebea0afed5455001abce52e0bf497d (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 3bdce0d0f02b5103458613c67f2e8a2fdf31e39d
Author: Chris Staub <chris at beaker67.com>
Date:   Mon Jun 30 03:57:45 2014 -0400

    Install documentation for Zlib

diff --git a/BOOK/final-system/common/zlib.xml b/BOOK/final-system/common/zlib.xml
index 5f6adb1..192560f 100644
--- a/BOOK/final-system/common/zlib.xml
+++ b/BOOK/final-system/common/zlib.xml
@@ -53,6 +53,11 @@ LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
 <screen os="i"><userinput>mv -v /usr/lib/libz.so.* /lib
 ln -sfv ../../lib/$(readlink /usr/lib/libz.so) /usr/lib/libz.so</userinput></screen>
 
+    <para os="j">Install the documentation:</para>
+
+<screen os="k"><userinput>mkdir -pv /usr/share/doc/zlib-&zlib-version;
+cp -rv doc/* examples /usr/share/doc/zlib-&zlib-version;</userinput></screen>
+
   </sect2>
 
   <sect2 id="contents-zlib" role="content">
@@ -60,9 +65,11 @@ ln -sfv ../../lib/$(readlink /usr/lib/libz.so) /usr/lib/libz.so</userinput></scr
 
     <segmentedlist>
       <segtitle>Installed libraries</segtitle>
+      <segtitle>Installed directory</segtitle>
 
       <seglistitem>
         <seg>libz.[a,so]</seg>
+        <seg>/usr/share/doc/zlib-&zlib-version;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/BOOK/final-system/multilib/zlib-64bit.xml b/BOOK/final-system/multilib/zlib-64bit.xml
index e24f98c..f32ea4d 100644
--- a/BOOK/final-system/multilib/zlib-64bit.xml
+++ b/BOOK/final-system/multilib/zlib-64bit.xml
@@ -63,6 +63,14 @@ LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
 <screen os="i"><userinput>mv -v /usr/lib64/libz.so.* /lib64
 ln -sfv ../../lib64/$(readlink /usr/lib64/libz.so) /usr/lib64/libz.so</userinput></screen>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index c5d6c9b..40fdd88 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -37,6 +37,16 @@
 -->
 
     <listitem>
+      <para>30 June 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Added documentation installation instructions
+          for Zlib.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>27 June 2014</para>
       <itemizedlist>
         <listitem>

commit 285a4d045654081a3cef5c79f73ef9937198fb6e
Author: Chris Staub <chris at beaker67.com>
Date:   Mon Jun 30 03:56:45 2014 -0400

    Updated date

diff --git a/BOOK/general.ent b/BOOK/general.ent
index 7023b9a..32243bc 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -2,7 +2,7 @@
 
 <!ENTITY month "06"> <!-- Use two digits -->
 <!ENTITY month_name "June">
-<!ENTITY day "27"> <!-- Use two digits -->
+<!ENTITY day "30"> <!-- Use two digits -->
 <!ENTITY year "2014"> <!-- Use four digits -->
 
 <!ENTITY releasedate "&month_name; &day;, &year;">

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

Summary of changes:
 BOOK/final-system/common/zlib.xml         |    7 +++++++
 BOOK/final-system/multilib/zlib-64bit.xml |    8 ++++++++
 BOOK/general.ent                          |    2 +-
 BOOK/introduction/common/changelog.xml    |   10 ++++++++++
 4 files changed, 26 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Cross-LFS Book