diff options
author | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2010-09-03 17:59:22 +0000 |
---|---|---|
committer | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2010-09-03 17:59:22 +0000 |
commit | 7fa322a1d3ca389822405e9d4a2609fb4e7f9278 (patch) | |
tree | 53205e93b580c70cfcdcee7661c74f43b8a0f233 | |
parent | 6f8df4bf431eb3e7a10d5a4f00a46db4e9a88460 (diff) |
Add sed to stop underquoting an M4 script in pkg-config
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9370 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r-- | chapter01/changelog.xml | 11 | ||||
-rw-r--r-- | chapter06/pkg-config.xml | 6 | ||||
-rw-r--r-- | general.ent | 4 |
3 files changed, 19 insertions, 2 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index ad874af14..21b00d061 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -37,6 +37,17 @@ --> <listitem> + <para>2010-09-03</para> + <itemizedlist> + <listitem> + <para>[bdubbs] - Add sed to stop underquoting an M4 script + in pkg-config. Fixes + <ulink url="&lfs-ticket-root;2746">#2746</ulink>.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>2010-08-31</para> <itemizedlist> <listitem> diff --git a/chapter06/pkg-config.xml b/chapter06/pkg-config.xml index ceb9581cf..4dd4f36ea 100644 --- a/chapter06/pkg-config.xml +++ b/chapter06/pkg-config.xml @@ -42,6 +42,12 @@ <sect2 role="installation"> <title>Installation of Pkg-config</title> + <para>First fix a problem with underquoting that shows up in later versions of + <command>autoconf</command>:</para> + +<screen><userinput remap="pre">sed -i -e 's/XT])dnl/XT])[]dnl/' \ + -e 's/\.])dnl/\.])[]dnl/' pkg.m4</userinput></screen> + <para>Prepare Pkg-config for compilation:</para> <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen> diff --git a/general.ent b/general.ent index 4e3fed40d..3a1874d50 100644 --- a/general.ent +++ b/general.ent @@ -1,5 +1,5 @@ -<!ENTITY version "SVN-20100831"> -<!ENTITY releasedate "August 31, 2010"> +<!ENTITY version "SVN-20100903"> +<!ENTITY releasedate "September 3, 2010"> <!ENTITY copyrightdate "1999-2010"><!-- jhalfs needs a literal dash, not – --> <!ENTITY milestone "6.7"> <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> |