aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml11
-rw-r--r--chapter06/glib.xml2
-rw-r--r--chapter06/pcre.xml2
-rw-r--r--general.ent4
4 files changed, 15 insertions, 4 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 1cd6d6f13..0d491ea69 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,17 @@
-->
<listitem>
+ <para>2011-05-23</para>
+ <itemizedlist>
+ <listitem>
+ <para>[matthew] - Fix a typo in the PCRE instructions, and make
+ Glib put its configuration in
+ <filename class="directory">/etc</filename>Upgrade to Udev-170.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2011-05-22</para>
<itemizedlist>
<listitem>
diff --git a/chapter06/glib.xml b/chapter06/glib.xml
index ee5297676..d55b413be 100644
--- a/chapter06/glib.xml
+++ b/chapter06/glib.xml
@@ -45,7 +45,7 @@
<para>Prepare Glib for compilation:</para>
-<screen><userinput remap="configure">PCRE_LIBS="-L/usr/lib -lpcre" PCRE_CFLAGS="-I/usr/include" ./configure --prefix=/usr --with-pcre=system</userinput></screen>
+<screen><userinput remap="configure">PCRE_LIBS="-L/usr/lib -lpcre" PCRE_CFLAGS="-I/usr/include" ./configure --prefix=/usr --sysconfdir=/etc --with-pcre=system</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>
diff --git a/chapter06/pcre.xml b/chapter06/pcre.xml
index 5d04a7f38..0032f2005 100644
--- a/chapter06/pcre.xml
+++ b/chapter06/pcre.xml
@@ -45,7 +45,7 @@
<para>Prepare PCRE for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr \
- --docdir=/usr/share/doc/pcre-8.10 \
+ --docdir=/usr/share/doc/pcre-&pcre-version; \
--enable-utf8 \
--enable-unicode-properties \
--enable-pcregrep-libz \
diff --git a/general.ent b/general.ent
index cfb8874ab..5bce289a2 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20110522">
-<!ENTITY releasedate "May 22, 2011">
+<!ENTITY version "SVN-20110523">
+<!ENTITY releasedate "May 23, 2011">
<!ENTITY copyrightdate "1999-2011"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "6.9">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->