diff options
| -rw-r--r-- | chapter01/changelog.xml | 10 | ||||
| -rw-r--r-- | chapter06/kbd.xml | 18 | ||||
| -rw-r--r-- | general.ent | 4 |
3 files changed, 20 insertions, 12 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index a52b7148b..b7ec3597b 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -37,6 +37,16 @@ --> <listitem> + <para>2012-06-10</para> + <itemizedlist> + <listitem> + <para>[ken] - kbd-1.15.3 : go back to changing configure, and touch + aclocal.m4 : thanks to Bryan for explaining the problem.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>2012-06-07</para> <itemizedlist> <listitem> 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 && + <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 && sed -i 's/resizecons.8 //' man/man8/Makefile.in && -autoreconf</userinput></screen> +touch -d '2011-05-07 08:30' configure.ac</userinput></screen> <para>Prepare Kbd for compilation:</para> diff --git a/general.ent b/general.ent index 1a92b27c7..d72bbd98b 100644 --- a/general.ent +++ b/general.ent @@ -1,5 +1,5 @@ -<!ENTITY version "SVN-20120607"> -<!ENTITY releasedate "June 7, 2012"> +<!ENTITY version "SVN-20120610"> +<!ENTITY releasedate "June 10, 2012"> <!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not – --> <!ENTITY milestone "7.2"> <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> |