[blfs-book] r12770 - in trunk/BOOK: archive general/graphlib general/prog multimedia/libdriv postlfs/editors postlfs/filesystems postlfs/security postlfs/shells postlfs/virtualization pst/sgml

bdubbs at higgs.linuxfromscratch.org bdubbs at higgs.linuxfromscratch.org
Sat Feb 22 18:30:29 PST 2014


Author: bdubbs
Date: Sat Feb 22 18:30:29 2014
New Revision: 12770

Log:
Fix man/doc locations for docbook-utils, sgml-common, tripwire
Restore the ed editor
Finish tagging for Post LFS Part of the book

Added:
   trunk/BOOK/postlfs/editors/ed.xml
      - copied, changed from r12768, trunk/BOOK/archive/ed.xml
Deleted:
   trunk/BOOK/archive/ed.xml
Modified:
   trunk/BOOK/general/graphlib/aalib.xml
   trunk/BOOK/general/prog/check.xml
   trunk/BOOK/general/prog/slang.xml
   trunk/BOOK/multimedia/libdriv/sdl.xml
   trunk/BOOK/postlfs/editors/editors.xml
   trunk/BOOK/postlfs/editors/joe.xml
   trunk/BOOK/postlfs/filesystems/jfs.xml
   trunk/BOOK/postlfs/filesystems/mdadm.xml
   trunk/BOOK/postlfs/filesystems/ntfs-3g.xml
   trunk/BOOK/postlfs/filesystems/parted.xml
   trunk/BOOK/postlfs/filesystems/xfsprogs.xml
   trunk/BOOK/postlfs/security/tripwire.xml
   trunk/BOOK/postlfs/shells/dash.xml
   trunk/BOOK/postlfs/shells/tcsh.xml
   trunk/BOOK/postlfs/virtualization/qemu.xml
   trunk/BOOK/pst/sgml/docbook-utils.xml
   trunk/BOOK/pst/sgml/sgml-common.xml

Modified: trunk/BOOK/general/graphlib/aalib.xml
==============================================================================
--- trunk/BOOK/general/graphlib/aalib.xml	Sat Feb 22 17:33:15 2014	(r12769)
+++ trunk/BOOK/general/graphlib/aalib.xml	Sat Feb 22 18:30:29 2014	(r12770)
@@ -32,7 +32,7 @@
     <para><application>AAlib</application> is a library to render any graphic into
     ASCII Art.</para>
 
-    &lfs74_checked;
+    &lfs75_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">

Modified: trunk/BOOK/general/prog/check.xml
==============================================================================
--- trunk/BOOK/general/prog/check.xml	Sat Feb 22 17:33:15 2014	(r12769)
+++ trunk/BOOK/general/prog/check.xml	Sat Feb 22 18:30:29 2014	(r12770)
@@ -35,7 +35,7 @@
       instructions install it permanently.
     </para>
 
-    &lfs74_checked;
+    &lfs75_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">

Modified: trunk/BOOK/general/prog/slang.xml
==============================================================================
--- trunk/BOOK/general/prog/slang.xml	Sat Feb 22 17:33:15 2014	(r12769)
+++ trunk/BOOK/general/prog/slang.xml	Sat Feb 22 18:30:29 2014	(r12770)
@@ -34,7 +34,7 @@
     It provides facilities required by interactive applications such as
     display/screen management, keyboard input and keymaps.</para>
 
-    &lfs74_checked;
+    &lfs75_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">

Modified: trunk/BOOK/multimedia/libdriv/sdl.xml
==============================================================================
--- trunk/BOOK/multimedia/libdriv/sdl.xml	Sat Feb 22 17:33:15 2014	(r12769)
+++ trunk/BOOK/multimedia/libdriv/sdl.xml	Sat Feb 22 18:30:29 2014	(r12770)
@@ -33,7 +33,7 @@
     for short) is a cross-platform library designed to make it easy to write
     multimedia software, such as games and emulators.</para>
 
-    &lfs74_checked;
+    &lfs75_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -87,6 +87,7 @@
     following commands:</para>
 
 <screen><userinput>sed -i '/_XData32/s:register long:register _Xconst long:' src/video/x11/SDL_x11sym.h &&
+
 ./configure --prefix=/usr --disable-static &&
 make</userinput></screen>
 

Copied and modified: trunk/BOOK/postlfs/editors/ed.xml (from r12768, trunk/BOOK/archive/ed.xml)
==============================================================================
--- trunk/BOOK/archive/ed.xml	Sat Feb 22 11:08:28 2014	(r12768, copy source)
+++ trunk/BOOK/postlfs/editors/ed.xml	Sat Feb 22 18:30:29 2014	(r12770)
@@ -36,7 +36,7 @@
     program if you encounter an ed-based patch file. This happens rarely
     because diff-based patches are preferred these days.</para>
 
-    &lfs74_checked;
+    &lfs75_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">

Modified: trunk/BOOK/postlfs/editors/editors.xml
==============================================================================
--- trunk/BOOK/postlfs/editors/editors.xml	Sat Feb 22 17:33:15 2014	(r12769)
+++ trunk/BOOK/postlfs/editors/editors.xml	Sat Feb 22 18:30:29 2014	(r12770)
@@ -21,6 +21,7 @@
   have been installed.</para>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bluefish.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="emacs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="joe.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nano.xml"/>

Modified: trunk/BOOK/postlfs/editors/joe.xml
==============================================================================
--- trunk/BOOK/postlfs/editors/joe.xml	Sat Feb 22 17:33:15 2014	(r12769)
+++ trunk/BOOK/postlfs/editors/joe.xml	Sat Feb 22 18:30:29 2014	(r12770)
@@ -33,7 +33,7 @@
     editor capable of emulating WordStar, <application>Pico</application>,
     and <application>Emacs</application>.</para>
 
-    &lfs74_checked;
+    &lfs75_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">

Modified: trunk/BOOK/postlfs/filesystems/jfs.xml
==============================================================================
--- trunk/BOOK/postlfs/filesystems/jfs.xml	Sat Feb 22 17:33:15 2014	(r12769)
+++ trunk/BOOK/postlfs/filesystems/jfs.xml	Sat Feb 22 18:30:29 2014	(r12770)
@@ -32,7 +32,7 @@
     <para>The <application>jfsutils</application> package contains administration
     and debugging tools for the jfs file system.</para>
 
-    &lfs74_checked;
+    &lfs75_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">

Modified: trunk/BOOK/postlfs/filesystems/mdadm.xml
==============================================================================
--- trunk/BOOK/postlfs/filesystems/mdadm.xml	Sat Feb 22 17:33:15 2014	(r12769)
+++ trunk/BOOK/postlfs/filesystems/mdadm.xml	Sat Feb 22 18:30:29 2014	(r12770)
@@ -32,7 +32,7 @@
     <para>The <application>mdadm</application> package contains administration
     tools for software RAID.</para>
 
-    &lfs74_checked;
+    &lfs75_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">

Modified: trunk/BOOK/postlfs/filesystems/ntfs-3g.xml
==============================================================================
--- trunk/BOOK/postlfs/filesystems/ntfs-3g.xml	Sat Feb 22 17:33:15 2014	(r12769)
+++ trunk/BOOK/postlfs/filesystems/ntfs-3g.xml	Sat Feb 22 18:30:29 2014	(r12770)
@@ -37,7 +37,7 @@
       from Linux.
     </para>
 
-    &lfs74_checked;
+    &lfs75_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">

Modified: trunk/BOOK/postlfs/filesystems/parted.xml
==============================================================================
--- trunk/BOOK/postlfs/filesystems/parted.xml	Sat Feb 22 17:33:15 2014	(r12769)
+++ trunk/BOOK/postlfs/filesystems/parted.xml	Sat Feb 22 18:30:29 2014	(r12770)
@@ -35,7 +35,7 @@
       partition resizing tool.
     </para>
 
-    &lfs74_checked;
+    &lfs75_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -94,7 +94,11 @@
 texi2dvi             -o doc/parted.dvi doc/parted.texi &&
 dvips                -o doc/parted.ps  doc/parted.dvi</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>.</para>
+    <para>
+      To test the results, issue: <command>make check</command>.  Note that
+      many tests are skipped if not run as the <systemitem
+      class="username">root</systemitem> user.  
+    </para>
 
     <para>
       Now, as the <systemitem class="username">root</systemitem> user:

Modified: trunk/BOOK/postlfs/filesystems/xfsprogs.xml
==============================================================================
--- trunk/BOOK/postlfs/filesystems/xfsprogs.xml	Sat Feb 22 17:33:15 2014	(r12769)
+++ trunk/BOOK/postlfs/filesystems/xfsprogs.xml	Sat Feb 22 18:30:29 2014	(r12770)
@@ -32,7 +32,7 @@
     <para>The <application>xfsprogs</application> package contains administration
     and debugging tools for the XFS file system.</para>
 
-    &lfs74_checked;
+    &lfs75_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">

Modified: trunk/BOOK/postlfs/security/tripwire.xml
==============================================================================
--- trunk/BOOK/postlfs/security/tripwire.xml	Sat Feb 22 17:33:15 2014	(r12769)
+++ trunk/BOOK/postlfs/security/tripwire.xml	Sat Feb 22 18:30:29 2014	(r12770)
@@ -32,7 +32,7 @@
     <para>The <application>Tripwire</application> package contains programs
     used to verify the integrity of the files on a given system.</para>
 
-    &lfs74_checked;
+    &lfs75_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -79,6 +79,8 @@
 <screen><userinput>sed -i -e 's at TWDB="${prefix}@TWDB="/var@' install/install.cfg            &&
 sed -i -e 's/!Equal/!this->Equal/' src/cryptlib/algebra.h                &&
 sed -i -e '/stdtwadmin.h/i#include <unistd.h>' src/twadmin/twadmincl.cpp &&
+sed -i -e '/TWMAN/ s|${prefix}|/usr/share|' \
+       -e '/TWDOCS/s|${prefix}|/usr/share|' install/install.cfg          &&
 
 ./configure --prefix=/usr --sysconfdir=/etc/tripwire                     &&
 make</userinput></screen>
@@ -93,7 +95,7 @@
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>make install &&
-cp -v policy/*.txt /usr/doc/tripwire</userinput></screen>
+cp -v policy/*.txt /usr/share/doc/tripwire</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/postlfs/shells/dash.xml
==============================================================================
--- trunk/BOOK/postlfs/shells/dash.xml	Sat Feb 22 17:33:15 2014	(r12769)
+++ trunk/BOOK/postlfs/shells/dash.xml	Sat Feb 22 18:30:29 2014	(r12770)
@@ -37,7 +37,7 @@
     failure. <application>Dash</application> is also useful for checking that
     a script is completely compatible with POSIX syntax.</para>
 
-    &lfs74_checked;
+    &lfs75_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">

Modified: trunk/BOOK/postlfs/shells/tcsh.xml
==============================================================================
--- trunk/BOOK/postlfs/shells/tcsh.xml	Sat Feb 22 17:33:15 2014	(r12769)
+++ trunk/BOOK/postlfs/shells/tcsh.xml	Sat Feb 22 18:30:29 2014	(r12770)
@@ -36,7 +36,7 @@
     and also because some programs require the C shell in order to perform
     installation tasks.</para>
 
-    &lfs74_checked;
+    &lfs75_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -72,6 +72,7 @@
     commands:</para>
 
 <screen><userinput>sed -i -e 's|\$\*|#&|' -e 's|fR/g|&m|' tcsh.man2html &&
+
 ./configure --prefix=/usr --bindir=/bin &&
 make &&
 sh ./tcsh.man2html</userinput></screen>

Modified: trunk/BOOK/postlfs/virtualization/qemu.xml
==============================================================================
--- trunk/BOOK/postlfs/virtualization/qemu.xml	Sat Feb 22 17:33:15 2014	(r12769)
+++ trunk/BOOK/postlfs/virtualization/qemu.xml	Sat Feb 22 18:30:29 2014	(r12770)
@@ -33,7 +33,7 @@
     for Linux on x86 hardware containing virtualization extensions (Intel VT or
     AMD-V).</para>
 
-    &lfs74_checked;
+    &lfs75_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">

Modified: trunk/BOOK/pst/sgml/docbook-utils.xml
==============================================================================
--- trunk/BOOK/pst/sgml/docbook-utils.xml	Sat Feb 22 17:33:15 2014	(r12769)
+++ trunk/BOOK/pst/sgml/docbook-utils.xml	Sat Feb 22 18:30:29 2014	(r12770)
@@ -107,7 +107,7 @@
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>make docdir=/usr/share/doc install</userinput></screen>
 
     <para>Many packages use an alternate name for the
     <application>DocBook-utils</application> scripts. If you wish to create
@@ -116,7 +116,7 @@
 
 <screen role="root"><userinput>for doctype in html ps dvi man pdf rtf tex texi txt
 do
-    ln -s docbook2$doctype /usr/bin/db2$doctype
+    ln -svf docbook2$doctype /usr/bin/db2$doctype
 done</userinput></screen>
 
     <note>
@@ -139,6 +139,10 @@
     <para><command>sed -i 's:/html::' doc/HTML/Makefile.in</command>:
     This command changes the installation directory of the HTML documents.</para>
 
+    <para><option>docdir=/usr/share/doc</option>:
+    This option is placed on the <command>make install</command> line because is is not 
+    recognized by <command>configure</command>.</para>
+
   </sect2>
 
   <sect2 role="content">

Modified: trunk/BOOK/pst/sgml/sgml-common.xml
==============================================================================
--- trunk/BOOK/pst/sgml/sgml-common.xml	Sat Feb 22 17:33:15 2014	(r12769)
+++ trunk/BOOK/pst/sgml/sgml-common.xml	Sat Feb 22 18:30:29 2014	(r12770)
@@ -98,9 +98,11 @@
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>make install &&
+<screen role="root"><userinput>make docdir=/usr/share/doc install &&
+
 install-catalog --add /etc/sgml/sgml-ent.cat \
     /usr/share/sgml/sgml-iso-entities-8879.1986/catalog &&
+
 install-catalog --add /etc/sgml/sgml-docbook.cat \
     /etc/sgml/sgml-ent.cat</userinput></screen>
 
@@ -112,6 +114,7 @@
 
 <screen role="root"><userinput>install-catalog --remove /etc/sgml/sgml-ent.cat \
     /usr/share/sgml/sgml-iso-entities-8879.1986/catalog &&
+
 install-catalog --remove /etc/sgml/sgml-docbook.cat \
     /etc/sgml/sgml-ent.cat</userinput></screen>
 



More information about the blfs-book mailing list