Changeset 9505860

Timestamp:

04/23/2008 04:32:52 PM (16 years ago)

Author:

Jeremy Huntwork <jhuntwork@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 6.4, 6.5, 6.6, 6.7, 6.8, 7.0, 7.1, 7.2, 7.3, 7.4, 7.5, 7.5-systemd, 7.6, 7.6-systemd, 7.7, 7.7-systemd, 7.8, 7.8-systemd, 7.9, 7.9-systemd, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

daf1314a

Parents:

a65fcb24

Message:

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

Files:

• chapter01/changelog.xml (modified) (1 diff)
• chapter06/kbd.xml (modified) (1 diff)

chapter01/changelog.xml

@@ -40 +40 @@
       <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,

chapter06/kbd.xml

@@ -60 +60 @@
 <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>