From e959f37816b230d6cccb8faa46582e2d1b706c64 Mon Sep 17 00:00:00 2001
From: DJ Lucas <dj@linuxfromscratch.org>
Date: Mon, 19 Mar 2012 04:45:08 +0000
Subject: [PATCH] move PCRE pc files to /usr/lib/pkgconfig and be more specific
 with cairo recommended dependendcy.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@9730 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general/genlib/pcre.xml            | 4 +++-
 introduction/welcome/changelog.xml | 3 +++
 x/lib/cairo.xml                    | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/general/genlib/pcre.xml b/general/genlib/pcre.xml
index 33cd021e88..94ffa81cc6 100644
--- a/general/genlib/pcre.xml
+++ b/general/genlib/pcre.xml
@@ -81,7 +81,9 @@ make</userinput></screen>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>make install &amp;&amp;
+mv /lib/pkgconfig/libpcre*.pc /usr/lib/pkgconfig</userinput></screen>
+
   </sect2>
 
   <sect2 role="commands">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 4834e980ed..15e6d20bf9 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -47,6 +47,9 @@
         <listitem>
           <para>[dj] - correct libtool archives for libattr and libacl.</para>
         </listitem>
+        <listitem>
+          <para>[dj] - move PCRE pc files to /usr/lib/pkgconfig.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 
diff --git a/x/lib/cairo.xml b/x/lib/cairo.xml
index 6110a3d2da..c4eeaf82e3 100644
--- a/x/lib/cairo.xml
+++ b/x/lib/cairo.xml
@@ -75,8 +75,8 @@
     <xref linkend="pixman"/>, and <xref linkend="fontconfig"/></para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="x-window-system"/> (gtk requires
-    cairo to be built after libX11 is installed)</para>
+    <para role="recommended"><xref linkend="xorg7-lib"/> (gtk requires
+    cairo to be built with the libX11 backend)</para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="gtk-doc"/>,