Author: randy
Date: 2006-06-26 13:00:09 -0600 (Mon, 26 Jun 2006)
New Revision: 6217

Modified:
   trunk/BOOK/gnome/add/epiphany.xml
   trunk/BOOK/gnome/add/evince.xml
   trunk/BOOK/gnome/add/evolution-data-server.xml
   trunk/BOOK/gnome/add/gcalctool.xml
   trunk/BOOK/gnome/add/gdm.xml
   trunk/BOOK/gnome/add/gnome-audio.xml
   trunk/BOOK/gnome/add/gnome-netstatus.xml
   trunk/BOOK/gnome/add/gtkhtml.xml
   trunk/BOOK/gnome/add/gtksourceview.xml
   trunk/BOOK/gnome/add/gucharmap.xml
   trunk/BOOK/gnome/add/libgnomecups.xml
   trunk/BOOK/gnome/add/libgnomeprint.xml
   trunk/BOOK/gnome/add/libgnomeprintui.xml
   trunk/BOOK/gnome/add/system-tools-backends.xml
   trunk/BOOK/gnome/add/totem.xml
Log:
Minor clean-up and addition of --mandir= parameter to the GNOME add-on packages 
which have already been updated to conform with the 2.14.2 update

Modified: trunk/BOOK/gnome/add/epiphany.xml
===================================================================
--- trunk/BOOK/gnome/add/epiphany.xml   2006-06-26 15:45:37 UTC (rev 6216)
+++ trunk/BOOK/gnome/add/epiphany.xml   2006-06-26 19:00:09 UTC (rev 6217)
@@ -130,15 +130,18 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This switch puts
-    configuration files in <filename 
class="directory">&gnome-etc-dir;</filename>
-    instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../../xincludes/gnome-prefix.xml"/>
 
-    <para><parameter>--localstatedir=/var/lib</parameter>: This switch
-    puts <application>ScrollKeeper</application> files in
-    <filename class="directory">/var/lib/scrollkeeper</filename> instead of
-    <filename 
class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../../xincludes/gnome-sysconfdir.xml"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../../xincludes/scrollkeeper-dir.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../../xincludes/gnome-mandir.xml"/>
+
   </sect2>
 
   <sect2 role="content">
@@ -152,7 +155,7 @@
       <seglistitem>
         <seg>epiphany</seg>
         <seg>None</seg>
-        <seg>The following subdirectories of $GNOME_PREFIX/:
+        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
         include/epiphany-2.14,
         lib/epiphany,
         share/{,gnome/help/, gtk-doc/html/, omf/}epiphany</seg>

Modified: trunk/BOOK/gnome/add/evince.xml
===================================================================
--- trunk/BOOK/gnome/add/evince.xml     2006-06-26 15:45:37 UTC (rev 6216)
+++ trunk/BOOK/gnome/add/evince.xml     2006-06-26 19:00:09 UTC (rev 6217)
@@ -104,8 +104,8 @@
     commands:</para>
 
 <screen><userinput>./configure --prefix=$(pkg-config --variable=prefix 
ORBit-2.0) \
+            --sysconfdir=&gnome-etc-dir; \
             --localstatedir=/var/lib \
-            --sysconfdir=&gnome-etc-dir; \
             --disable-ps \
             --enable-pixbuf &amp;&amp;
 make</userinput></screen>
@@ -121,15 +121,15 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><parameter>--localstatedir=/var/lib</parameter>: This switch
-    puts <application>ScrollKeeper</application> files in
-    <filename class="directory">/var/lib/scrollkeeper</filename> instead of
-    <filename 
class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../../xincludes/gnome-prefix.xml"/>
 
-    <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This switch puts
-    configuration files in <filename 
class="directory">&gnome-etc-dir;</filename>
-    instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../../xincludes/gnome-sysconfdir.xml"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../../xincludes/scrollkeeper-dir.xml"/>
+
     <para><option>--disable-ps</option>: This parameter is required if you
     don't have a Ghostscript package installed. Remove the parameter if you
     do have a Ghostscript package installed and wish to build the DVI
@@ -161,7 +161,7 @@
         <seg>evince and evince-thumbnailer</seg>
         <seg>libevince-properties-page.{so,a}
         <application>Nautilus</application> extension</seg>
-        <seg>$GNOME_PREFIX/share/{,gnome/help/ ,omf/}evince</seg>
+        <seg><envar>$GNOME_PREFIX</envar>/share/{,gnome/help/ 
,omf/}evince</seg>
       </seglistitem>
     </segmentedlist>
 

Modified: trunk/BOOK/gnome/add/evolution-data-server.xml
===================================================================
--- trunk/BOOK/gnome/add/evolution-data-server.xml      2006-06-26 15:45:37 UTC 
(rev 6216)
+++ trunk/BOOK/gnome/add/evolution-data-server.xml      2006-06-26 19:00:09 UTC 
(rev 6217)
@@ -142,9 +142,13 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../../xincludes/gnome-prefix.xml"/>
+
     <para><parameter>--libexecdir=$(pkg-config --variable=prefix
-    ORBit-2.0)/lib/evolution-data-server-1.2</parameter>: This switch puts
-    libexec files in <filename
+    ORBit-2.0)/lib/evolution-data-server-1.2</parameter>: This parameter causes
+    the libexec files to be installed in the preferred location of
+    <filename
     class="directory">$GNOME_PREFIX/lib/evolution-data-server-1.2</filename>
     instead of <filename
     class="directory">$GNOME_PREFIX/libexec</filename>.</para>
@@ -192,7 +196,7 @@
         libedataserver-1.2.so, libedataserverui-1.2.so, libegroupwise-1.2.so,
         libexchange-storage-1.2.so and numerous provider and extension
         modules.</seg>
-        <seg>The following subdirectories of $GNOME_PREFIX/:
+        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
         include/evolution-data-server-1.6,
         lib/evolution-data-server-1.2,
         share/{evolution-data-server-1.6,

Modified: trunk/BOOK/gnome/add/gcalctool.xml
===================================================================
--- trunk/BOOK/gnome/add/gcalctool.xml  2006-06-26 15:45:37 UTC (rev 6216)
+++ trunk/BOOK/gnome/add/gcalctool.xml  2006-06-26 19:00:09 UTC (rev 6217)
@@ -78,7 +78,9 @@
 
 <screen><userinput>./configure --prefix=$(pkg-config --variable=prefix 
ORBit-2.0) \
             --sysconfdir=&gnome-etc-dir; \
-            --localstatedir=/var/lib &amp;&amp;
+            --localstatedir=/var/lib \
+            --mandir=$(pkg-config
+                --variable=prefix ORBit-2.0)/share/man &amp;&amp;
 make</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
@@ -92,15 +94,18 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This switch puts
-    configuration files in <filename 
class="directory">&gnome-etc-dir;</filename>
-    instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../../xincludes/gnome-prefix.xml"/>
 
-    <para><parameter>--localstatedir=/var/lib</parameter>: This switch
-    puts <application>ScrollKeeper</application> files in
-    <filename class="directory">/var/lib/scrollkeeper</filename> instead of
-    <filename 
class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../../xincludes/gnome-sysconfdir.xml"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../../xincludes/scrollkeeper-dir.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../../xincludes/gnome-mandir.xml"/>
+
   </sect2>
 
   <sect2 role="content">
@@ -114,7 +119,8 @@
       <seglistitem>
         <seg>gcalctool and gnome-calculator</seg>
         <seg>None</seg>
-        <seg>$GNOME_PREFIX/share/{gnome/help/, omf/}gcalctool</seg>
+        <seg><envar>$GNOME_PREFIX</envar>/share/{gnome/help/,
+        omf/}gcalctool</seg>
       </seglistitem>
     </segmentedlist>
 

Modified: trunk/BOOK/gnome/add/gdm.xml
===================================================================
--- trunk/BOOK/gnome/add/gdm.xml        2006-06-26 15:45:37 UTC (rev 6216)
+++ trunk/BOOK/gnome/add/gdm.xml        2006-06-26 19:00:09 UTC (rev 6217)
@@ -100,6 +100,8 @@
             --localstatedir=/var/lib \
             --libexecdir=$(pkg-config \
                 --variable=prefix ORBit-2.0)/lib/gdm \
+            --mandir=$(pkg-config \
+                --variable=prefix ORBit-2.0)/share/man \
             --with-pam-prefix=/etc &amp;&amp;
 make</userinput></screen>
 
@@ -114,16 +116,11 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><parameter>--libexecdir=$(pkg-config
-    --variable=prefix ORBit-2.0)/lib/gdm</parameter>: This parameter is
-    used so that the <application>GDM</application> internal support programs
-    are installed in
-    <filename class='directory'>$GNOME_PREFIX/lib/gdm</filename> instead
-    of <filename class='directory'>$GNOME_PREFIX/libexec</filename>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../../xincludes/gnome-prefix.xml"/>
 
-    <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This command 
puts
-    configuration files in <filename 
class="directory">&gnome-etc-dir;</filename>
-    instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../../xincludes/gnome-sysconfdir.xml"/>
 
     <para><parameter>--localstatedir=/var/lib</parameter>: This command
     puts files in <filename class="directory">/var/lib</filename> instead of
@@ -133,6 +130,16 @@
     directory. See the <quote>Configuration Information</quote> section below
     for instructions on relocating the log file directory.</para>
 
+    <para><parameter>--libexecdir=$(pkg-config
+    --variable=prefix ORBit-2.0)/lib/gdm</parameter>: This parameter is
+    used so that the <application>GDM</application> internal support programs
+    are installed in the preferred location of
+    <filename class='directory'>$GNOME_PREFIX/lib/gdm</filename> instead
+    of <filename class='directory'>$GNOME_PREFIX/libexec</filename>.</para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../../xincludes/gnome-mandir.xml"/>
+
     <para><parameter>--with-pam-prefix=/etc</parameter>: This command puts
     <application>PAM</application> configuration files in
     <filename class="directory">/etc/pam.d</filename> instead of

Modified: trunk/BOOK/gnome/add/gnome-audio.xml
===================================================================
--- trunk/BOOK/gnome/add/gnome-audio.xml        2006-06-26 15:45:37 UTC (rev 
6216)
+++ trunk/BOOK/gnome/add/gnome-audio.xml        2006-06-26 19:00:09 UTC (rev 
6217)
@@ -76,6 +76,17 @@
 
   </sect2>
 
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><parameter>prefix=$(pkg-config --variable=prefix
+    ORBit-2.0)</parameter>: Setting the prefix using this parameter instead of
+    with <envar>$GNOME_PREFIX</envar> will ensure that the prefix is consistent
+    with the installation environment and the package will be installed in the
+    correct location.</para>
+
+  </sect2>
+
   <sect2 role="content">
     <title>Contents</title>
 
@@ -87,7 +98,7 @@
       <seglistitem>
         <seg>None</seg>
         <seg>None</seg>
-        <seg>$GNOME_PREFIX/share/sounds</seg>
+        <seg><envar>$GNOME_PREFIX</envar>/share/sounds</seg>
       </seglistitem>
     </segmentedlist>
 

Modified: trunk/BOOK/gnome/add/gnome-netstatus.xml
===================================================================
--- trunk/BOOK/gnome/add/gnome-netstatus.xml    2006-06-26 15:45:37 UTC (rev 
6216)
+++ trunk/BOOK/gnome/add/gnome-netstatus.xml    2006-06-26 19:00:09 UTC (rev 
6217)
@@ -92,21 +92,22 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../../xincludes/gnome-prefix.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../../xincludes/gnome-sysconfdir.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../../xincludes/scrollkeeper-dir.xml"/>
+
     <para><parameter>--libexecdir=$(pkg-config --variable=prefix
-    ORBit-2.0)/lib/gnome-netstatus</parameter>: This switch puts libexec files
+    ORBit-2.0)/lib/gnome-netstatus</parameter>: This parameter causes the
+    libexec files to be installed in the preferred location of
     in <filename class="directory">$GNOME_PREFIX/lib/gnome-netstatus</filename>
     instead of
     <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
 
-    <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This switch puts
-    configuration files in <filename 
class="directory">&gnome-etc-dir;</filename>
-    instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
-
-    <para><parameter>--localstatedir=/var/lib</parameter>: This switch
-    puts <application>ScrollKeeper</application> files in
-    <filename class="directory">/var/lib/scrollkeeper</filename> instead of
-    <filename 
class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
-
   </sect2>
 
   <sect2 role="content">
@@ -122,7 +123,8 @@
         <seg>None</seg>
         <seg>None</seg>
         <seg>gnome-netstatus-applet</seg>
-        <seg>$GNOME_PREFIX/share/{,gnome/help/ ,omf/}gnome-netstatus</seg>
+        <seg><envar>$GNOME_PREFIX</envar>/share/{,gnome/help/
+        ,omf/}gnome-netstatus</seg>
       </seglistitem>
     </segmentedlist>
 

Modified: trunk/BOOK/gnome/add/gtkhtml.xml
===================================================================
--- trunk/BOOK/gnome/add/gtkhtml.xml    2006-06-26 15:45:37 UTC (rev 6216)
+++ trunk/BOOK/gnome/add/gtkhtml.xml    2006-06-26 19:00:09 UTC (rev 6217)
@@ -97,6 +97,20 @@
 
   </sect2>
 
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../../xincludes/gnome-prefix.xml"/>
+
+    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
+    ORBit-2.0)/lib/gtkhtml</parameter>: This parameter causes the libexec
+    files to be installed in the preferred location of
+    <filename class="directory">$GNOME_PREFIX/lib/gtkhtml</filename> instead of
+    <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
+
+  </sect2>
+
   <sect2 role="content">
     <title>Contents</title>
 
@@ -108,7 +122,7 @@
       <seglistitem>
         <seg>None</seg>
         <seg>libgtkhtml-3.8.{so,a} and libgnome-gtkhtml-editor-3.8.{so,a}</seg>
-        <seg>The following subdirectories of $GNOME_PREFIX/:
+        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
         include/libgtkhtml-3.8,
         lib/gtkhtml, and
         share/gtkhtml-3.8</seg>

Modified: trunk/BOOK/gnome/add/gtksourceview.xml
===================================================================
--- trunk/BOOK/gnome/add/gtksourceview.xml      2006-06-26 15:45:37 UTC (rev 
6216)
+++ trunk/BOOK/gnome/add/gtksourceview.xml      2006-06-26 19:00:09 UTC (rev 
6217)
@@ -100,7 +100,7 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
     href="../../xincludes/gtk-doc-rebuild.xml"/>
-  
+
   </sect2>
 
   <sect2 role="content">

Modified: trunk/BOOK/gnome/add/gucharmap.xml
===================================================================
--- trunk/BOOK/gnome/add/gucharmap.xml  2006-06-26 15:45:37 UTC (rev 6216)
+++ trunk/BOOK/gnome/add/gucharmap.xml  2006-06-26 19:00:09 UTC (rev 6217)
@@ -97,11 +97,12 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><parameter>--localstatedir=/var/lib</parameter>: This switch
-    puts <application>ScrollKeeper</application> files in
-    <filename class="directory">/var/lib/scrollkeeper</filename> instead of
-    <filename 
class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../../xincludes/gnome-prefix.xml"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../../xincludes/scrollkeeper-dir.xml"/>
+
   </sect2>
 
   <sect2 role="content">
@@ -115,7 +116,7 @@
       <seglistitem>
         <seg>charmap, gnome-character-map, and gucharmap</seg>
         <seg>libgucharmap.so</seg>
-        <seg>The following subdirectories $GNOME_PREFIX/:
+        <seg>The following subdirectories <envar>$GNOME_PREFIX</envar>/:
         include/gucharmap and
         share/{gnome/help/,omf/}/gucharmap</seg>
       </seglistitem>

Modified: trunk/BOOK/gnome/add/libgnomecups.xml
===================================================================
--- trunk/BOOK/gnome/add/libgnomecups.xml       2006-06-26 15:45:37 UTC (rev 
6216)
+++ trunk/BOOK/gnome/add/libgnomecups.xml       2006-06-26 19:00:09 UTC (rev 
6217)
@@ -92,6 +92,14 @@
 
   </sect2>
 
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../../xincludes/gnome-prefix.xml"/>
+
+  </sect2>
+
   <sect2 role="content">
     <title>Contents</title>
 
@@ -103,7 +111,7 @@
       <seglistitem>
         <seg>None</seg>
         <seg>libgnomecups-1.0.{so,a}</seg>
-        <seg>$GNOME_PREFIX/include/libgnomecups-1</seg>
+        <seg><envar>$GNOME_PREFIX</envar>/include/libgnomecups-1</seg>
       </seglistitem>
     </segmentedlist>
 

Modified: trunk/BOOK/gnome/add/libgnomeprint.xml
===================================================================
--- trunk/BOOK/gnome/add/libgnomeprint.xml      2006-06-26 15:45:37 UTC (rev 
6216)
+++ trunk/BOOK/gnome/add/libgnomeprint.xml      2006-06-26 19:00:09 UTC (rev 
6217)
@@ -107,6 +107,9 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../../xincludes/gnome-prefix.xml"/>
+
     <para><parameter>--disable-gtk-doc</parameter>: This switch prevents
     rebuilding the documentation during the <command>make</command>
     command. Remove this parameter if you have
@@ -126,7 +129,7 @@
       <seglistitem>
         <seg>None</seg>
         <seg>libgnomeprint-2-2.{so,a} and numerous filters and modules</seg>
-        <seg>The following subdirectories of $GNOME_PREFIX/:
+        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
         include/libgnomeprint-2.2,
         lib/libgnomeprint,
         share/{,gtk-doc/html/}libgnomeprint</seg>

Modified: trunk/BOOK/gnome/add/libgnomeprintui.xml
===================================================================
--- trunk/BOOK/gnome/add/libgnomeprintui.xml    2006-06-26 15:45:37 UTC (rev 
6216)
+++ trunk/BOOK/gnome/add/libgnomeprintui.xml    2006-06-26 19:00:09 UTC (rev 
6217)
@@ -93,6 +93,9 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../../xincludes/gnome-prefix.xml"/>
+
     <para><option>--enable-gtk-doc</option>: Use this option if you have
     <application>GTK-Doc</application> installed and wish to build the API
     documentation, as the source tarball does not contain any pre-built
@@ -111,7 +114,7 @@
       <seglistitem>
         <seg>None</seg>
         <seg>libgnomeprintui-2-2.{so,a}</seg>
-        <seg>The following subdirectories of $GNOME_PREFIX/:
+        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
         include/libgnomeprintui-2.2 and
         share/{,gtk-doc/html/}libgnomeprintui</seg>
       </seglistitem>

Modified: trunk/BOOK/gnome/add/system-tools-backends.xml
===================================================================
--- trunk/BOOK/gnome/add/system-tools-backends.xml      2006-06-26 15:45:37 UTC 
(rev 6216)
+++ trunk/BOOK/gnome/add/system-tools-backends.xml      2006-06-26 19:00:09 UTC 
(rev 6217)
@@ -90,6 +90,14 @@
 
   </sect2>
 
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../../xincludes/gnome-prefix.xml"/>
+
+  </sect2>
+
   <sect2 role="content">
     <title>Contents</title>
 
@@ -101,7 +109,7 @@
       <seglistitem>
         <seg>None</seg>
         <seg>None</seg>
-        <seg>$GNOME_PREFIX/share/setup-tool-backends</seg>
+        <seg><envar>$GNOME_PREFIX</envar>/share/setup-tool-backends</seg>
       </seglistitem>
     </segmentedlist>
 

Modified: trunk/BOOK/gnome/add/totem.xml
===================================================================
--- trunk/BOOK/gnome/add/totem.xml      2006-06-26 15:45:37 UTC (rev 6216)
+++ trunk/BOOK/gnome/add/totem.xml      2006-06-26 19:00:09 UTC (rev 6217)
@@ -97,10 +97,12 @@
     commands:</para>
 
 <screen><userinput>./configure --prefix=$(pkg-config --variable=prefix 
ORBit-2.0) \
+            --sysconfdir=&gnome-etc-dir; \
             --localstatedir=/var/lib \
-            --sysconfdir=&gnome-etc-dir; \
             --libexecdir=$(pkg-config \
-                --variable=prefix ORBit-2.0)/lib/totem &amp;&amp;
+                --variable=prefix ORBit-2.0)/lib/totem \
+            --mandir=$(pkg-config \
+                --variable=prefix ORBit-2.0)/share/man &amp;&amp;
 make</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
@@ -114,21 +116,25 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../../xincludes/gnome-prefix.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../../xincludes/gnome-sysconfdir.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../../xincludes/scrollkeeper-dir.xml"/>
+
     <para><parameter>--libexecdir=$(pkg-config
     --variable=prefix ORBit-2.0)/lib/totem</parameter>: This parameter is
-    used so that the movie player plugin for browsers is installed in
+    used so that the movie player browser plugin is installed in the preferred
+    location of
     <filename class='directory'>$GNOME_PREFIX/lib/totem</filename> instead
     of <filename class='directory'>$GNOME_PREFIX/libexec</filename>.</para>
 
-    <para><parameter>--localstatedir=/var/lib</parameter>: This switch
-    puts <application>ScrollKeeper</application> files in
-    <filename class="directory">/var/lib/scrollkeeper</filename> instead of
-    <filename 
class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../../xincludes/gnome-mandir.xml"/>
 
-    <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This switch puts
-    configuration files in <filename 
class="directory">&gnome-etc-dir;</filename>
-    instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
-
     <!-- This is broken now so disabling the comment
     <para><option>-enable-vanity</option>: Using this parameter will build the
     webcam utility (still in development).</para>
@@ -163,7 +169,7 @@
         <seg>libtotem-plparser.{so,a}, a <application>Nautilus</application>
         extension plugin and optionally, a <application>Mozilla</application>
         video plugin</seg>
-        <seg>The following subdirectories of $GNOME_PREFIX/:
+        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
         include/totem,
         lib/totem,
         share/{,gnome/help/ ,omf/}totem</seg>

-- 
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to