Bladeren bron

Correct the fix for Automake's testsuite.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9907 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Matthew Burgess 13 jaren geleden
bovenliggende
commit
b8bda22c6c
3 gewijzigde bestanden met toevoegingen van 13 en 3 verwijderingen
  1. 10 0
      chapter01/changelog.xml
  2. 1 1
      chapter06/automake.xml
  3. 2 2
      general.ent

+ 10 - 0
chapter01/changelog.xml

@@ -37,6 +37,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>

+ 1 - 1
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>
 

+ 2 - 2
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}]" -->