aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Moffat <ken@linuxfromscratch.org>2012-08-24 02:48:55 +0000
committerKen Moffat <ken@linuxfromscratch.org>2012-08-24 02:48:55 +0000
commit0a50cc245b4346da6e16701e16f11878598c2923 (patch)
tree0ae15d6cd406519652e8df57346317d5b2c77cbd
parentda7032a745c8bcb0b4e08964d4906058cc30c8de (diff)
Remove redundant sed from automake.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9959 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml8
-rw-r--r--chapter06/automake.xml5
-rw-r--r--general.ent4
3 files changed, 10 insertions, 7 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index b7ed025f4..ba13d7fb1 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,14 @@
</listitem>
-->
+ <listitem>
+ <para>2012-08-24</para>
+ <itemizedlist>
+ <listitem>
+ <para>[ken] - remove redundant sed from automake.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
<listitem>
<para>2012-08-22</para>
diff --git a/chapter06/automake.xml b/chapter06/automake.xml
index 30574caf1..53ea72496 100644
--- a/chapter06/automake.xml
+++ b/chapter06/automake.xml
@@ -41,11 +41,6 @@
<sect2 role="installation">
<title>Installation of Automake</title>
- <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 '48i$sleep' t/aclocal7.sh</userinput></screen>
-
<para>Prepare Automake for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr --docdir=/usr/share/doc/automake-&automake-version;</userinput></screen>
diff --git a/general.ent b/general.ent
index ea1d05e76..9f0e237e4 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20120822">
-<!ENTITY releasedate "August 22, 2012">
+<!ENTITY version "SVN-20120824">
+<!ENTITY releasedate "August 24, 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}]" -->