Author: ken
Date: 2012-02-15 15:33:24 -0700 (Wed, 15 Feb 2012)
New Revision: 9425
Modified:
trunk/BOOK/general.ent
trunk/BOOK/gnome/core/libgtop.xml
trunk/BOOK/introduction/welcome/changelog.xml
Log:
libgtop-2.28.4 : This does indeed install an info file, but in
$prefix/share/info so the --infodir switch is unnecessary.
Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent 2012-02-15 22:11:18 UTC (rev 9424)
+++ trunk/BOOK/general.ent 2012-02-15 22:33:24 UTC (rev 9425)
@@ -688,7 +688,7 @@
<!ENTITY gnome-js-common-version "0.1.2">
<!ENTITY libgnomekbd-version "3.2.0">
<!ENTITY libgnome-keyring-version "3.2.2">
-<!ENTITY libgtop-version "2.28.1">
+<!ENTITY libgtop-version "2.28.4">
<!ENTITY libgweather-version "2.30.2">
<!ENTITY vte-version "0.24.2">
<!ENTITY zenity-version "2.30.0">
Modified: trunk/BOOK/gnome/core/libgtop.xml
===================================================================
--- trunk/BOOK/gnome/core/libgtop.xml 2012-02-15 22:11:18 UTC (rev 9424)
+++ trunk/BOOK/gnome/core/libgtop.xml 2012-02-15 22:33:24 UTC (rev 9425)
@@ -4,12 +4,12 @@
<!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
- <!ENTITY libgtop-download-http
"&gnome-download-http;/libgtop/2.28/libgtop-&libgtop-version;.tar.bz2">
- <!ENTITY libgtop-download-ftp
"&gnome-download-ftp;/libgtop/2.28/libgtop-&libgtop-version;.tar.bz2">
- <!ENTITY libgtop-md5sum "994c299b6dba330524a67ea45776b3ab">
- <!ENTITY libgtop-size "742 KB">
- <!ENTITY libgtop-buildsize "15 MB">
- <!ENTITY libgtop-time "0.2 SBU">
+ <!ENTITY libgtop-download-http
"&gnome-download-http;/libgtop/2.28/libgtop-&libgtop-version;.tar.xz">
+ <!ENTITY libgtop-download-ftp
"&gnome-download-ftp;/libgtop/2.28/libgtop-&libgtop-version;.tar.xz">
+ <!ENTITY libgtop-md5sum "c8aee3c9bde9033303147e993aa1b932">
+ <!ENTITY libgtop-size "639 KB">
+ <!ENTITY libgtop-buildsize "18 MB">
+ <!ENTITY libgtop-time "0.3 SBU">
]>
<sect1 id="libgtop" xreflabel="LibGTop-&libgtop-version;">
@@ -32,7 +32,7 @@
<para>The <application>LibGTop</application> package contains the
<application>GNOME</application> top libraries.</para>
- &lfs65_checked;
+ &lfs70_built;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
@@ -81,8 +81,7 @@
<para>Install <application>LibGTop</application> by running the following
commands:</para>
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix
ORBit-2.0) \
- --infodir=$(pkg-config --variable=prefix ORBit-2.0)/share/info
&&
+<screen><userinput>./configure --prefix=$GNOME_PREFIX &&
make</userinput></screen>
<para>This package does not come with a test suite.</para>
@@ -94,10 +93,8 @@
<para>If you would like to install the example programs, issue the
following
commands as the <systemitem class="username">root</systemitem> user:</para>
-<screen role="root"><userinput>install -v -m755 -d $(pkg-config \
- --variable=prefix ORBit-2.0)/lib/libgtop/examples &&
-install -v -m755 examples/.libs/* \
- $(pkg-config --variable=prefix
ORBit-2.0)/lib/libgtop/examples</userinput></screen>
+<screen role="root"><userinput>install -v -m755 -d
$GNOME_PREFIX/lib/libgtop/examples &&
+install -v -m755 examples/.libs/*
$GNOME_PREFIX/lib/libgtop/examples</userinput></screen>
</sect2>
@@ -107,15 +104,20 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../xincludes/gnome-prefix.xml"/>
- <para><parameter>--infodir=$(pkg-config --variable=prefix
- ORBit-2.0)/share/info</parameter>:
+ <!-- this DOES install an info file, but in $datarootdir/info which is
+ $prefix/share/info : adding the directory is covered in configuring
+
+ <para><parameter>\-\-infodir=$GNOME_PREFIX/share/info</parameter>:
This switch installs the info documentation in
<filename class='directory'>$GNOME_PREFIX/share/info</filename> instead of
<filename class='directory'>$GNOME_PREFIX/info</filename>. You may need to
add this directory to your <envar>$INFOPATH</envar> environment variable if
your <application>GNOME</application> installation prefix is anything other
- than <filename class='directory'>/usr</filename>.</para>
+ than <filename class='directory'>/usr</filename>.</para>-->
+ <para><option>--enable-static=no</option>: This switch prevents the static
+ libraries being installed.</para>
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../xincludes/gtk-doc-rebuild.xml"/>
@@ -132,8 +134,7 @@
<envar>INFOPATH</envar> environment variable by adding the following
to your system-wide or personal profile:</para>
-<screen><literal>export INFOPATH=/usr/share/info:$(pkg-config \
- --variable=prefix ORBit-2.0)/share/info</literal></screen>
+<screen><literal>export
INFOPATH=/usr/share/info:$GNOME_PREFIX/share/info</literal></screen>
</sect3>
@@ -153,7 +154,8 @@
wd (examples programs)</seg>
<seg>libgtop-2.0.{so,a}</seg>
<seg><envar>$GNOME_PREFIX</envar>/{include/libgtop-2.0/glibtop,
- share/gtk-doc/html/libgtop,lib/libgtop/examples}</seg>
+ share/{gtk-doc/html/libgtop,locale/la/LC_MESSAGES},
+ lib/libgtop/examples}</seg>
</seglistitem>
</segmentedlist>
Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml 2012-02-15 22:11:18 UTC
(rev 9424)
+++ trunk/BOOK/introduction/welcome/changelog.xml 2012-02-15 22:33:24 UTC
(rev 9425)
@@ -74,6 +74,9 @@
<listitem>
<para>[ken] - merge libgnome-keyring-3.2.2 from Wayne.</para>
</listitem>
+ <listitem>
+ <para>[ken] - merge libgtop-2.28.4 from Wayne.</para>
+ </listitem>
</itemizedlist>
</listitem>
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page