aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml6
-rw-r--r--chapter06/kbd.xml8
2 files changed, 14 insertions, 0 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 6c2c58080..aea7cd4b3 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,12 @@
<listitem>
<para>2008-04-23</para>
<itemizedlist>
+ <listitem>
+ <para>[jhuntwork] - Fixed behavior in kbd where man pages
+ for optional programs that aren't built are installed.
+ Thanks Greg Schafer for spotting this.
+ </para>
+ </listitem>
<listitem>
<para>[jhuntwork] - Fixed kbd to install getkeycodes,
setkeycodes and resizecons. Also moved loadkeys to /bin from
diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml
index 235ad4990..af999a6eb 100644
--- a/chapter06/kbd.xml
+++ b/chapter06/kbd.xml
@@ -60,6 +60,14 @@
<screen><userinput remap="pre">sed -i -e '1i KEYCODES_PROGS = @KEYCODES_PROGS@' \
-e '1i RESIZECONS_PROGS = @RESIZECONS_PROGS@' src/Makefile.in</userinput></screen>
+ <para>This version of Kbd will also install man pages for optional programs
+ even if we don't use the <parameter>--enable-optional-progs</parameter>
+ option to build them. Fix this behavior:</para>
+
+<screen><userinput remap="pre">var=OPTIONAL_PROGS
+sed -i "s/ifdef $var/ifeq (\$($var),yes)/" man/Makefile.in
+unset var</userinput></screen>
+
<para>Prepare Kbd for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr --datadir=/lib/kbd</userinput></screen>