[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. 2ce95e99ad3a0d1169215caf90ba4e121ac2f591

[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  2ce95e99ad3a0d1169215caf90ba4e121ac2f591 (commit)
      from  2864455cf31674fedcd12c95eeb796dfde7137e7 (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 2ce95e99ad3a0d1169215caf90ba4e121ac2f591
Author: Jonathan Norman <jonathan at bluesquarelinux.co.uk>
Date:   Thu May 19 15:23:24 2011 +0100

    No longer need to move liblmza.a in XZ for pure 32 / 64bit builds

diff --git a/BOOK/final-system/common/xz.xml b/BOOK/final-system/common/xz.xml
index 90d3614..040d287 100644
--- a/BOOK/final-system/common/xz.xml
+++ b/BOOK/final-system/common/xz.xml
@@ -35,18 +35,18 @@
 
 <screen os="d"><userinput>make</userinput></screen>
 
-    <para os="e">Install the programs:</para>
+    <para os="e">To test the results, issue:
+    <userinput>make check</userinput>.</para>
 
-<screen os="f"><userinput>make install</userinput></screen>
 
-    <para os="g">Move the <filename>xz</filename> binary, and several symlinks
-    that point to it, into the /bin directory:</para>
+    <para os="f">Install the programs:</para>
 
-<screen os="h"><userinput>mv -v /usr/bin/{xz,lzma,lzcat,unlzma,unxz,xzcat} /bin</userinput></screen>
+<screen os="g"><userinput>make install</userinput></screen>
 
-    <para os="i">Move the static libraries to the proper location:</para>
+    <para os="h">Move the <filename>xz</filename> binary, and several symlinks
+    that point to it, into the /bin directory:</para>
 
-<screen os="j"><userinput>mv -v /lib/liblzma.a /usr/lib</userinput></screen>
+<screen os="i"><userinput>mv -v /usr/bin/{xz,lzma,lzcat,unlzma,unxz,xzcat} /bin</userinput></screen>
 
   </sect2>
 
diff --git a/BOOK/final-system/multilib/xz-64bit.xml b/BOOK/final-system/multilib/xz-64bit.xml
index 3e4515b..b0886ba 100644
--- a/BOOK/final-system/multilib/xz-64bit.xml
+++ b/BOOK/final-system/multilib/xz-64bit.xml
@@ -55,7 +55,11 @@
     href="xz.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
-<screen os="j"><userinput>mv -v /lib64/liblzma.a /usr/lib64</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="xz.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <screen os="k"><userinput>mv -v /lib64/liblzma.a /usr/lib64</userinput></screen>
 
   </sect2>
 
diff --git a/BOOK/final-system/multilib/xz-n32.xml b/BOOK/final-system/multilib/xz-n32.xml
index a9a558a..ce7c4eb 100644
--- a/BOOK/final-system/multilib/xz-n32.xml
+++ b/BOOK/final-system/multilib/xz-n32.xml
@@ -56,7 +56,11 @@
     href="xz.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
-<screen os="j"><userinput>mv -v /lib32/liblzma.a /usr/lib32</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="xz.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+<screen os="k"><userinput>mv -v /lib32/liblzma.a /usr/lib32</userinput></screen>
 
   </sect2>
 
diff --git a/BOOK/final-system/multilib/xz.xml b/BOOK/final-system/multilib/xz.xml
index 2729da9..ff38c86 100644
--- a/BOOK/final-system/multilib/xz.xml
+++ b/BOOK/final-system/multilib/xz.xml
@@ -56,9 +56,9 @@
     href="../common/xz.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xz.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
+    <para os="j">Move the static libraries to the proper location:</para>
+
+    <screen os="k"><userinput>mv -v /lib/liblzma.a /usr/lib</userinput></screen>
 
   </sect2>
 
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 75f49cf..a82f1e5 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -40,6 +40,9 @@
       <para>May 19, 2011</para>
       <itemizedlist>
         <listitem>
+          <para>[Jonathan] - No longer need to move liblmza.a on pure builds.</para>
+        </listitem>
+        <listitem>
           <para>[Jonathan] - Added Glib, dependancy of new Pkg-config.</para>
         </listitem>
         <listitem>

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

Summary of changes:
 BOOK/final-system/common/xz.xml         |   14 +++++++-------
 BOOK/final-system/multilib/xz-64bit.xml |    6 +++++-
 BOOK/final-system/multilib/xz-n32.xml   |    6 +++++-
 BOOK/final-system/multilib/xz.xml       |    6 +++---
 BOOK/introduction/common/changelog.xml  |    3 +++
 5 files changed, 23 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
Cross-LFS Book