r6045 - in trunk/BOOK: introduction/welcome x/lib

dj at linuxfromscratch.org dj at linuxfromscratch.org
Wed May 10 22:05:12 PDT 2006


Author: dj
Date: 2006-05-10 23:05:10 -0600 (Wed, 10 May 2006)
New Revision: 6045

Modified:
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/x/lib/mesalib.xml
Log:
Corrected mesalib instructions to account for X11R6.

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2006-05-11 00:42:37 UTC (rev 6044)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2006-05-11 05:05:10 UTC (rev 6045)
@@ -48,6 +48,10 @@
           <para>[randy] - Added commands to the cpio instructions to create
           alternate forms of the documentation.</para>
         </listitem>
+        <listitem>
+          <para>[dj] - Corrected MesaLib instructions to account for 
+          X11R6.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 

Modified: trunk/BOOK/x/lib/mesalib.xml
===================================================================
--- trunk/BOOK/x/lib/mesalib.xml	2006-05-11 00:42:37 UTC (rev 6044)
+++ trunk/BOOK/x/lib/mesalib.xml	2006-05-11 05:05:10 UTC (rev 6045)
@@ -64,8 +64,11 @@
     <bridgehead renderas="sect3">MesaLib Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="x-window-system"/> or
-    <xref linkend="xorg7"/> Libs and Utilities, <xref linkend="libdrm"/> and
+    <para>
+<!--<xref linkend="x-window-system"/> -->
+    <xref linkend="xorg"/> or
+    <xref linkend="xorg7-lib"/> and <xref linkend="xorg7-util"/>, 
+    <xref linkend="libdrm"/>, and
     <xref linkend="pkgconfig"/></para>
 
     <bridgehead renderas="sect3">Recommended Download</bridgehead>
@@ -94,14 +97,20 @@
   <sect2 role="installation">
     <title>Installation of MesaLib</title>
 
-    <para>If you've installed the X Window System into any prefix other than
-    <filename class="directory">/usr</filename>, then you'll need to adjust the
-    commands below for your system.  Correct several hard coded directories
-    in the source files with the following commands:</para>
+    <para>You will need to adjust the commands below to reflect the
+    installation prefix of the X Window System.  First, correct several 
+    hard coded directories in the source files with the following 
+    command (you can skip this first command if the prefix is 
+   <filename class="directory">/usr/X11R6</filename>):</para>
 
-<screen><userinput>find . -type f -exec sed -i 's@/usr/X11R6@/usr at g' {} \; &&
-sed -i 's at lib/modules at lib/X11/modules@' src/glx/x11/dri_glx.c</userinput></screen>
+<screen><userinput>find . -type f -exec sed -i 's@/usr/X11R6@<replaceable><PREFIX></replaceable>@g' {} \;</userinput></screen>
 
+    <para>If building for <application>Xorg-&xorg7-version;</application>,
+    issue the following command to correct for the default module path in the
+    new build system:</para>
+
+<screen><userinput>sed -i 's at lib/modules at lib/X11/modules@' src/glx/x11/dri_glx.c</userinput></screen>
+
     <para>Build <application>MesaLib</application>
     by running the following command:</para>
 
@@ -115,9 +124,9 @@
     System into any prefix other than 
     <filename class="directory">/usr</filename>:</para>
 
-<screen role="root"><userinput>bin/installmesa /usr &&
-mkdir -v -p /usr/lib/X11/modules/dri &&
-install -v -m755 lib/*dri* /usr/lib/X11/modules/dri</userinput></screen>
+<screen role="root"><userinput>bin/installmesa <replaceable><PREFIX></replaceable> &&
+mkdir -v -p <replaceable><PREFIX></replaceable>/lib/X11/modules/dri &&
+install -v -m755 lib/*dri* <replaceable><PREFIX></replaceable>/lib/X11/modules/dri</userinput></screen>
 
     <para>If you've extracted the Demos package as well, then
     build the test programs with the following commands:</para>
@@ -130,7 +139,7 @@
     <systemitem class="username">root</systemitem> user, again adjusting for 
     the prefix of your X Window System:</para>
 
-<screen role="root"><userinput>install -v -m755 glxinfo glxgears /usr/bin</userinput></screen>
+<screen role="root"><userinput>install -v -m755 glxinfo glxgears <replaceable><PREFIX></replaceable>/bin</userinput></screen>
 
     <note>
       <para>If building <xref linkend="xorg7"/>, do not
@@ -151,8 +160,9 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><command>find...sed -i 's@/usr/X11R6@/usr@'...</command>: This
-    command corrects several hard coded references to the X11R6 default
+    <para><command>find...sed -i 
+    's@/usr/X11R6@/<replaceable><PREFIX></replaceable>@'...</command>: 
+    This command corrects several hard coded references to the X11R6 default
     installation path.</para>
 
     <para><command>sed -i 's at lib/modules at lib/X11/modules@'
@@ -164,7 +174,8 @@
     target.</para>
 
     <para><command>install -v -m755 lib/*dri*
-    /usr/lib/X11/modules/dri</command>: installs the DRI modules.</para>
+    <replaceable><PREFIX></replaceable>/lib/X11/modules/dri</command>: 
+    installs the DRI modules.</para>
 
     <para><command>sed -i 's at -l$(GLUT_LIB)@@g' configs/default</command>:
     disables linking against GLUT libraries for the demo programs.</para>
@@ -172,7 +183,8 @@
     <para><command>make PROGS='glxinfo glxgears'</command>: build only
     the glxinfo and glxgears programs.</para>
 
-    <para><command>install -v -m755 glxinfo glxgears /usr/bin</command>:
+    <para><command>install -v -m755 glxinfo glxgears 
+    <replaceable><PREFIX></replaceable>/bin</command>:
     Installs only the glxinfo and glxgears programs.</para>
 
   </sect2>




More information about the blfs-book mailing list