[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. 80244daa0b03f4efeb9015d59ee089ea1c8e5b63

[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  80244daa0b03f4efeb9015d59ee089ea1c8e5b63 (commit)
      from  a518847c16bd5b99d6d016a482ba62a52daf6d8c (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 80244daa0b03f4efeb9015d59ee089ea1c8e5b63
Author: William Harrington <kb0iic at gmail.com>
Date:   Mon Aug 6 17:34:13 2012 -0500

    Adjust final system xz install command for proper installation of the lzma pkgconfig file.

diff --git a/BOOK/final-system/common/xz.xml b/BOOK/final-system/common/xz.xml
index 040d287..43bf8b8 100644
--- a/BOOK/final-system/common/xz.xml
+++ b/BOOK/final-system/common/xz.xml
@@ -41,7 +41,7 @@
 
     <para os="f">Install the programs:</para>
 
-<screen os="g"><userinput>make install</userinput></screen>
+<screen os="g"><userinput>make pkgconfigdir=/usr/lib/pkgconfig install</userinput></screen>
 
     <para os="h">Move the <filename>xz</filename> binary, and several symlinks
     that point to it, into the /bin directory:</para>
diff --git a/BOOK/final-system/multilib/xz-64bit.xml b/BOOK/final-system/multilib/xz-64bit.xml
index b0886ba..fd8ac38 100644
--- a/BOOK/final-system/multilib/xz-64bit.xml
+++ b/BOOK/final-system/multilib/xz-64bit.xml
@@ -43,9 +43,7 @@
     href="xz.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="xz.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
+<screen os="g"><userinput>make pkgconfigdir=/usr/lib64/pkgconfig install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="xz.xml"
diff --git a/BOOK/final-system/multilib/xz-n32.xml b/BOOK/final-system/multilib/xz-n32.xml
index ce7c4eb..202daba 100644
--- a/BOOK/final-system/multilib/xz-n32.xml
+++ b/BOOK/final-system/multilib/xz-n32.xml
@@ -44,9 +44,7 @@
     href="xz.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="xz.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
+<screen os="g"><userinput>make pkgconfigdir=/usr/lib32/pkgconfig install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="xz.xml"
diff --git a/BOOK/general.ent b/BOOK/general.ent
index c633fa8..927af20 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -2,7 +2,7 @@
 
 <!ENTITY month "08"> <!-- Use two digits -->
 <!ENTITY month_name "August">
-<!ENTITY day "02"> <!-- Use two digits -->
+<!ENTITY day "06"> <!-- Use two digits -->
 <!ENTITY year "2012"> <!-- Use four digits -->
 
 <!ENTITY releasedate "&month_name; &day;, &year;">
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 8f9a3ab..ed1131a 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -37,6 +37,15 @@
 -->
 
     <listitem>
+      <para>06 August 2012</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Adjust XZ final system install command to properly install the lzma pkgconfig file to the proper location.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>02 August 2012</para>
       <itemizedlist>
         <listitem>

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

Summary of changes:
 BOOK/final-system/common/xz.xml         |    2 +-
 BOOK/final-system/multilib/xz-64bit.xml |    4 +---
 BOOK/final-system/multilib/xz-n32.xml   |    4 +---
 BOOK/general.ent                        |    2 +-
 BOOK/introduction/common/changelog.xml  |    9 +++++++++
 5 files changed, 13 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
Cross-LFS Book