kbd-1.15.3 : another attempt at fixing it properly, tested in Pacific/Pago_Pago (and also /Kiritimati) with a little allowance for future TZs later than Pago_Pago.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9882 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

1 files changed, 8 insertions, 10 deletions

diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml
index f7784bfaf..26b91a782 100644
--- a/chapter06/kbd.xml
+++ b/chapter06/kbd.xml
@@ -68,17 +68,15 @@ so the sed will need attention if that change is not removed before the next rel
     with modern KMS, to provide the video mode files - for normal use
     <command>setfont</command> sizes the console appropriately) and its manpage.</para>
 
-    <para>Because we change <filename>Makefile.in</filename>, with modern autotools
-    various commands will be rerun by <command>make</command> after
-    <command>configure</command> has run.  In this case, <filename>configure</filename>
-    will be regenerated, so we need to change <filename>configure.ac</filename>.
-    Running <command>autoreconf</command> ensures this all happens before
-    <command>configure</command> is run, instead of during <command>make</command>.
-    </para>
-
-<screen><userinput remap="pre">sed -i 's/\(RESIZECONS_PROGS=\)yes/\1no/' configure.ac &amp;&amp;
+    <para>The shipped version of <filename>configure.ac</filename> is newer than
+    <filename>aclocal.m4</filename>, so autotools will be run by <command>make</command>
+    which will overwrite the change to <filename>configure</filename>. Alter the date
+    and time of <filename>configure.ac</filename> - this uses the system timezone, so we
+    pick a time that is sufficiently old in all timezones.</para>
+
+<screen><userinput remap="pre">sed -i 's/\(RESIZECONS_PROGS=\)yes/\1no/' configure &amp;&amp;
 sed -i 's/resizecons.8 //' man/man8/Makefile.in &amp;&amp;
-autoreconf</userinput></screen>
+touch -d '2011-05-07 08:30' configure.ac</userinput></screen>
 
     <para>Prepare Kbd for compilation:</para>