aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml14
-rw-r--r--chapter06/libpipeline.xml12
-rw-r--r--general.ent4
3 files changed, 22 insertions, 8 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 5a5388276..b75e5a7c5 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,20 @@
</listitem>
-->
+
+ <listitem>
+ <para>2012-07-10</para>
+ <itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Specify PKG_CONFIG_PATH for libpipeline
+ checks. Fixes
+ <ulink url="&lfs-ticket-root;3120">#3120</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+
+
<listitem>
<para>2012-06-23</para>
<itemizedlist>
diff --git a/chapter06/libpipeline.xml b/chapter06/libpipeline.xml
index e3e248760..d9ecf4e55 100644
--- a/chapter06/libpipeline.xml
+++ b/chapter06/libpipeline.xml
@@ -43,21 +43,21 @@
<para>Prepare Libpipeline for compilation:</para>
-<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
-<!--
+<screen><userinput remap="configure">PKG_CONFIG_PATH=/tools/lib/pkgconfig ./configure --prefix=/usr</userinput></screen>
+
<variablelist>
<title>The meaning of the configure options:</title>
<varlistentry>
- <term><parameter>CHECK_CFLAGS=, CHECK_LIBS=</parameter></term>
+ <term><parameter>PKG_CONFIG_PATH</parameter></term>
<listitem>
- <para>These environment variables specify the location of the test
- library built in <xref linkend="ch-tools-check"/>.</para>
+ <para>Use pkg-config to obtain the location of the test
+ library metadata built in <xref linkend="ch-tools-check"/>.</para>
</listitem>
</varlistentry>
</variablelist>
--->
+
<para>Compile the package:</para>
<screen><userinput remap="make">make</userinput></screen>
diff --git a/general.ent b/general.ent
index 9549f4e9e..d46cd9886 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20120623">
-<!ENTITY releasedate "June 23, 2012">
+<!ENTITY version "SVN-20120710">
+<!ENTITY releasedate "July 10, 2012">
<!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "7.2">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->