diff options
| author | Jeremy Huntwork <jhuntwork@linuxfromscratch.org> | 2008-04-23 16:32:52 +0000 |
|---|---|---|
| committer | Jeremy Huntwork <jhuntwork@linuxfromscratch.org> | 2008-04-23 16:32:52 +0000 |
| commit | 95058604071cd2d13166101b8eb1e1bc30c47d15 (patch) | |
| tree | 9e0152cfdfa2c285f936e52d6b0c5a204ae7db1d | |
| parent | a65fcb24427a8ac0cc89fb3469601721532bcd5d (diff) | |
Fixed behavior in kbd where man pages for optional programs that aren't built
are installed. Thanks Greg Schafer for spotting this.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8537 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
| -rw-r--r-- | chapter01/changelog.xml | 6 | ||||
| -rw-r--r-- | chapter06/kbd.xml | 8 |
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> |