aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Burgess <matthew@linuxfromscratch.org>2012-07-14 11:25:28 +0000
committerMatthew Burgess <matthew@linuxfromscratch.org>2012-07-14 11:25:28 +0000
commitb8bda22c6c465773b3cf81ef8a040125d967ef68 (patch)
treeef54da1ba8635ae81a7f7948f6e36de0e183ed7e
parentba4639d5e6fab2cd1961f758774e4c8bf5d48361 (diff)
Correct the fix for Automake's testsuite.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9907 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml10
-rw-r--r--chapter06/automake.xml2
-rw-r--r--general.ent4
3 files changed, 13 insertions, 3 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 08918f9fe..a590c6293 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -38,6 +38,16 @@
-->
<listitem>
+ <para>2012-07-14</para>
+ <itemizedlist>
+ <listitem>
+ <para>[matthew] - Correct the fix for Automake's testsuite. Thanks
+ to Fernando de Oliveira for the report.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2012-07-13</para>
<itemizedlist>
<listitem>
diff --git a/chapter06/automake.xml b/chapter06/automake.xml
index 925d4d39e..30574caf1 100644
--- a/chapter06/automake.xml
+++ b/chapter06/automake.xml
@@ -44,7 +44,7 @@
<para>Fix a bug in the testsuite that can cause one of the tests to fail
intermittently:</para>
-<screen><userinput remap="pre">sed -i -e '/$ACLOCAL/i$sleep' t/aclocal7.sh</userinput></screen>
+<screen><userinput remap="pre">sed -i -e '48i$sleep' t/aclocal7.sh</userinput></screen>
<para>Prepare Automake for compilation:</para>
diff --git a/general.ent b/general.ent
index 8726f0f01..21e9083f5 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20120713">
-<!ENTITY releasedate "July 13, 2012">
+<!ENTITY version "SVN-20120714">
+<!ENTITY releasedate "July 14, 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}]" -->