Author: bdubbs
Date: Wed Oct 1 12:56:19 2014
New Revision: 14450
Log:
Update doc directory for xfsprogs, xapian, and wicd.
For some reason havind an entity in an id="" field doesn't
validate fo rme. Change to a constant. It's only used internally
so it doesn't need to change with version.
Modified:
trunk/BOOK/general/genlib/xapian.xml
trunk/BOOK/gnome/platform/vte.xml
trunk/BOOK/networking/netutils/wicd.xml
trunk/BOOK/postlfs/filesystems/xfsprogs.xml
Modified: trunk/BOOK/general/genlib/xapian.xml
==============================================================================
--- trunk/BOOK/general/genlib/xapian.xml Wed Oct 1 11:15:04 2014
(r14449)
+++ trunk/BOOK/general/genlib/xapian.xml Wed Oct 1 12:56:19 2014
(r14450)
@@ -70,7 +70,8 @@
running the following commands:</para>
<screen><userinput>./configure --prefix=/usr \
- --disable-static &&
+ --disable-static \
+ --docdir=/usr/share/doc/xapian-core-&xapian-version; &&
make</userinput></screen>
<para>
@@ -102,7 +103,9 @@
libxapian.so
</seg>
<seg>
- /usr/include/xapian, /usr/lib/cmake/xapian and
/usr/share/doc/xapian-core
+ /usr/include/xapian,
+ /usr/lib/cmake/xapian, and
+ /usr/share/doc/xapian-core-&xapian-version;
</seg>
</seglistitem>
</segmentedlist>
Modified: trunk/BOOK/gnome/platform/vte.xml
==============================================================================
--- trunk/BOOK/gnome/platform/vte.xml Wed Oct 1 11:15:04 2014 (r14449)
+++ trunk/BOOK/gnome/platform/vte.xml Wed Oct 1 12:56:19 2014 (r14450)
@@ -169,27 +169,27 @@
<?dbfo list-presentation="list"?>
<?dbhtml list-presentation="table"?>
- <varlistentry id="vte2-&vte-nano;">
+ <varlistentry id="vte291">
<term><command>vte2_&vte-nano;</command></term>
<listitem>
<para>
is a test application for the <application>VTE</application>
libraries.
</para>
- <indexterm zone="vte vte2-&vte-nano;">
+ <indexterm zone="vte vte291">
<primary sortas="b-vte2-&vte-nano;">vte2_&vte-nano;</primary>
</indexterm>
</listitem>
</varlistentry>
- <varlistentry id="libvte2-&vte-nano;">
+ <varlistentry id="libvte291">
<term><filename
class="libraryfile">libvte2_&vte-nano;.so</filename></term>
<listitem>
<para>
is a library which implements a terminal emulator
widget for <application>GTK+ 3</application>.
</para>
- <indexterm zone="vte libvte2-&vte-nano;">
+ <indexterm zone="vte libvte291">
<primary
sortas="c-libvte2-&vte-nano;">libvte2_&vte-nano;.so</primary>
</indexterm>
</listitem>
Modified: trunk/BOOK/networking/netutils/wicd.xml
==============================================================================
--- trunk/BOOK/networking/netutils/wicd.xml Wed Oct 1 11:15:04 2014
(r14449)
+++ trunk/BOOK/networking/netutils/wicd.xml Wed Oct 1 12:56:19 2014
(r14450)
@@ -61,14 +61,7 @@
<para>Estimated build time: &wicd-time;</para>
</listitem>
</itemizedlist>
-<!--
- <bridgehead renderas="sect3">Additional Downloads</bridgehead>
- <itemizedlist spacing='compact'>
- <listitem>
- <para></para>
- </listitem>
- </itemizedlist>
--->
+
<bridgehead renderas="sect3">Wicd Dependencies</bridgehead>
<note><para>Wicd uses <command>ifconfig</command> to activate network
@@ -116,10 +109,12 @@
<screen><userinput>sed -i '/wpath.logrotate\|wpath.systemd/d' setup.py
&&
rm po/*.po &&
+
python setup.py configure --no-install-kde \
--no-install-acpi \
--no-install-pmutils \
- --no-install-init</userinput></screen>
+ --no-install-init \
+
--docdir=/usr/share/doc/wicd-&wicd-version;</userinput></screen>
<para>This package does not come with a test suite.</para>
@@ -132,15 +127,15 @@
<sect2 role="commands">
<title>Command Explanations</title>
+ <para><command>sed -i '/wpath...</command>: This <command>sed</command>
+ prevents installation of <command>logrotate</command> and systemd
+ configuration files. You may omit it if you use these utilities.</para>
+
<para><command>rm po/*.po</command>: This command removes the international
messages associated with this package. The command is required unless
Babel is installed. If it is installed, po/ast.po still needs to be
removed
in order for the build to complete.</para>
- <para><command>sed -i '/wpath...</command>: This <command>sed</command>
- prevents installation of <command>logrotate</command> and systemd
- configuration files. You may omit it if you use these utilities.</para>
-
<para><option>--no-install-kde</option>: Prevent installation of an
autostart desktop file for KDE. If you use KDE, you should instead install
the
<ulink
url="http://projects.kde.org/projects/extragear/network/wicd-kde";>Wicd KDE
Client</ulink>.
Modified: trunk/BOOK/postlfs/filesystems/xfsprogs.xml
==============================================================================
--- trunk/BOOK/postlfs/filesystems/xfsprogs.xml Wed Oct 1 11:15:04 2014
(r14449)
+++ trunk/BOOK/postlfs/filesystems/xfsprogs.xml Wed Oct 1 12:56:19 2014
(r14450)
@@ -92,10 +92,10 @@
<para>Now, as the <systemitem class="username">root</systemitem>
user:</para>
-<screen role="root"><userinput>make install &&
-make install-dev &&
-rm -rfv /lib/libhandle.{a,la,so} &&
-ln -sfv ../../lib/libhandle.so.1 /usr/lib/libhandle.so &&
+<screen role="root"><userinput>make
PKG_DOC_DIR=/usr/share/doc/xfsprogs-&xfsprogs-version; install &&
+make PKG_DOC_DIR=/usr/share/doc/xfsprogs-&xfsprogs-version; install-dev
&&
+rm -rfv /lib/libhandle.{a,la,so} &&
+ln -sfv ../../lib/libhandle.so.1 /usr/lib/libhandle.so &&
sed -i "s@libdir='/lib@libdir='/usr/lib@g"
/usr/lib/libhandle.la</userinput></screen>
</sect2>
@@ -136,7 +136,7 @@
xfs_logprint, xfs_mdrestore, xfs_metadump, xfs_mkfile, xfs_ncheck,
xfs_quota, xfs_repair, and xfs_rtcp</seg>
<seg>libhandle.{so,a}</seg>
- <seg>/usr/include/xfs and /usr/share/doc/xfsprogs</seg>
+ <seg>/usr/include/xfs and
/usr/share/doc/xfsprogs-&xfsprogs-version;</seg>
</seglistitem>
</segmentedlist>
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
