Ticket #2526: diff

multimedia/libdriv/nas.xml

@@ -82 +82 @@
   <sect2 role="installation">
     <title>Installation of NAS</title>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/X11R6_symlink.xml"/>
+
     <para>Install <application>NAS</application> by running the
     following commands:</para>
 
@@ -157 +160 @@
 
 <screen role="root"><userinput>make install-nas</userinput></screen>
 
+<!-- XFREE86
       <para>The init script uses a default prefix of
       <filename class="directory">/usr/X11R6</filename>.  If you've installed
       the <application>X Window System</application> into any other prefix,
@@ -166 +170 @@
 
 <screen role="root"><userinput>sed -i 's@/usr/X11R6@<replaceable>&lt;PREFIX&gt;</replaceable>@' /etc/rc.d/init.d/nas</userinput></screen>
 
+XFREE86 -->
+
       <para>The init script uses a default parameter to allow access to all
       hosts on the network. Review the <command>nasd</command> man page for
       other available parameters if you need to modify the script.</para>

x/installing/xorg7.xml

@@ -147 +147 @@
 <screen><userinput>export XORG_CONFIG="--prefix=$XORG_PREFIX --sysconfdir=/etc \
     --mandir=$XORG_PREFIX/share/man --localstatedir=/var"</userinput></screen>
 
+    <note>
+      <para>Make sure that you also add these variables to your personal or
+      system-wide profile as they are used throughout this book. See
+      <xref linkend="postlfs-config-profile"/> for more information.</para>
+    </note>
+
     <para>If you've decided to use an alternate prefix, be sure to add
     <filename class="directory">
-    <replaceable>&lt;PREFIX&gt;</replaceable>/bin</filename> to your
+    $XORG_PREFIX/bin</filename> to your
     <envar>PATH</envar> environment variable and  <filename class="directory">
-    <replaceable>&lt;PREFIX&gt;</replaceable>/lib/pkgconfig</filename>
+    $XORG_PREFIX/lib/pkgconfig</filename>
     to your <envar>PKG_CONFIG_PATH</envar> variable.  For detailed instructions,
     see <xref linkend="postlfs-config-profile"/>.  You should also add
     <filename class="directory">
-    <replaceable>&lt;PREFIX&gt;</replaceable>/lib</filename> to the
+    $XORG_PREFIX/lib</filename> to the
     <filename>/etc/ld.so.conf</filename> file and <filename class="directory">
-    <replaceable>&lt;PREFIX&gt;</replaceable>/share/man</filename> as
+    $XORG_PREFIX/share/man</filename> as
     a MANDATORY_MANPATH in <filename>/etc/man_db.conf</filename>.</para>
 
     <para>Packages in Xorg store their configuration files in

x/lib/lesstif.xml

@@ -103 +103 @@
 <screen role="root"><userinput>make rootdir=/usr/share/doc/lesstif-&lesstif-version; install &amp;&amp;
 ldconfig</userinput></screen>
 
-    <para>You will need to change the <application>X</application> prefix in
-    the commands below if your X Window System is installed anywhere other than
-    <filename class='directory'>/usr/X11R6</filename>.</para>
+<screen role="root"><userinput>mv -v $XORG_PREFIX/lib/X11/mwm /etc/X11 &amp;&amp;
+ln -v -s /etc/X11/mwm $XORG_PREFIX/lib/X11</userinput></screen>
 
-<screen role="root"><userinput>mv -v <replaceable>&lt;/usr/X11R6&gt;</replaceable>/lib/X11/mwm /etc/X11 &amp;&amp;
-ln -v -s /etc/X11/mwm <replaceable>&lt;/usr/X11R6&gt;</replaceable>/lib/X11</userinput></screen>
-
   </sect2>
 
   <sect2 role="commands">
@@ -134 +130 @@
     non-FHS compliant <filename class="directory">/usr/LessTif</filename>
     directory.</para>
 
-    <para><command>mv -v <replaceable>&lt;/usr/X11R6&gt;</replaceable>/lib/X11/mwm
-    /etc/X11</command>:
+    <para><command>mv -v $XORG_PREFIX/lib/X11/mwm /etc/X11</command>:
     The FHS requires that configuration files exist only in the
     <filename class="directory">/etc/X11</filename> directory.  The
     configuration directory (<filename class="directory">mwm</filename>)

x/lib/libxklavier.xml

@@ -89 +89 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><option>--with-xkb-base=<replaceable>&lt;$X_PREFIX&gt;</replaceable>/share/X11/xkb</option>:
+    <para><option>--with-xkb-base=$XORG_PREFIX/share/X11/xkb</option>:
     Use this parameter (substitute properly for the
-    <replaceable>&lt;$X_PREFIX&gt;</replaceable>) if the
-    <replaceable>&lt;$X_PREFIX&gt;</replaceable> is anything other than
+    $XORG_PREFIX) if the $XORG_PREFIX is anything other than
     <filename class='directory'>/usr</filename>.</para>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"