Browse Source

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

Jeremy Huntwork 17 years ago
parent
commit
9505860407
2 changed files with 14 additions and 0 deletions
  1. 6 0
      chapter01/changelog.xml
  2. 8 0
      chapter06/kbd.xml

+ 6 - 0
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

+ 8 - 0
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>