diff options
| author | Matthew Burgess <matthew@linuxfromscratch.org> | 2011-05-23 19:20:23 +0000 |
|---|---|---|
| committer | Matthew Burgess <matthew@linuxfromscratch.org> | 2011-05-23 19:20:23 +0000 |
| commit | fa3f7174d6216704f9d81c14c67c525c48786566 (patch) | |
| tree | 99fff548e2d32db8c220ebf33c2bec78cc60bf9d | |
| parent | 5de4ea079a38196b7d4161dd7ed0bff5459d18c6 (diff) | |
Fix a couple of issues with the newly added PCRE and Glib packages.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9554 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
| -rw-r--r-- | chapter01/changelog.xml | 11 | ||||
| -rw-r--r-- | chapter06/glib.xml | 2 | ||||
| -rw-r--r-- | chapter06/pcre.xml | 2 | ||||
| -rw-r--r-- | general.ent | 4 |
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 – --> <!ENTITY milestone "6.9"> <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> |