r5699 - in trunk/BOOK: general/genutils x/installing x/lib

dj at linuxfromscratch.org dj at linuxfromscratch.org
Thu Mar 2 19:51:21 PST 2006


Author: dj
Date: 2006-03-02 20:51:21 -0700 (Thu, 02 Mar 2006)
New Revision: 5699

Modified:
   trunk/BOOK/general/genutils/xterm.xml
   trunk/BOOK/x/installing/xorg7.xml
   trunk/BOOK/x/lib/mesalib.xml
Log:
additional cleanups for Xorg-7 and related pages

Modified: trunk/BOOK/general/genutils/xterm.xml
===================================================================
--- trunk/BOOK/general/genutils/xterm.xml	2006-03-02 20:43:38 UTC (rev 5698)
+++ trunk/BOOK/general/genutils/xterm.xml	2006-03-03 03:51:21 UTC (rev 5699)
@@ -87,7 +87,6 @@
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-
 <screen role="root"><userinput>make install</userinput></screen>
 
   </sect2>
@@ -99,6 +98,12 @@
     corrects the PROJECTROOT definition for an installation prefix of 
     <filename class="directory">/usr</filename>.</para>
 
+    <para><parameter>--with-luit</parameter>: enables the luit filter for 
+    unicode translation.</para>
+
+    <para><parameter>--with-wide-chars</parameter>: adds support for wide
+    characters.</para>
+
   </sect2>
 
   <sect2 role="content">

Modified: trunk/BOOK/x/installing/xorg7.xml
===================================================================
--- trunk/BOOK/x/installing/xorg7.xml	2006-03-02 20:43:38 UTC (rev 5698)
+++ trunk/BOOK/x/installing/xorg7.xml	2006-03-03 03:51:21 UTC (rev 5699)
@@ -51,9 +51,9 @@
 
     <bridgehead renderas="sect3">Xorg Download and Installation Instructions</bridgehead>
 
-    <para>With the new modular build system, is no longer possible to download
-    the entire package in a single file.  In fact, there may be upto 200 files 
-    that need to be fetched from the download location.  To assist with
+    <para>With the modular build system, it is no longer possible to download
+    the entire package in a single file.  In fact, there may be as may as 200 
+    files that need to be fetched from the download location.  To assist with
     such a large task, it is strongly recommended to install 
     <xref linkend="wget"/> for downloading the needed files.  A complete 
     <application>wget</application> script is available for each section at 
@@ -147,9 +147,13 @@
       by running the following commands for each package to be installed.</para>
 
 <screen><userinput>./configure $XORG_CONFIG &&
-make &&
-make install</userinput></screen>
+make</userinput></screen>
 
+      <para>Now as the <systemitem class="username">root</systemitem>
+      user:</para>
+
+<screen><userinput role="root">make install</userinput></screen>
+
     </sect3>
 
   </sect2>
@@ -179,25 +183,37 @@
 <screen><userinput>sed -i "s@/usr/X11R6@$XORG_PREFIX@" site.def &&
 sed -i "s@/usr/X11R6@$XORG_PREFIX@" X11.tmpl &&
 ./configure $XORG_CONFIG --with-config-dir=$XORG_PREFIX/lib/X11/config &&
-make &&
-make install</userinput></screen>
+make</userinput></screen>
 
+      <para>Now as the <systemitem class="username">root</systemitem>
+      user:</para>
+
+<screen><userinput role="root">make install</userinput></screen>
+
       <para>Next, install the <application>Imake</application> package with
       these commands:</para>
 
 <screen><userinput>./configure $XORG_CONFIG --with-config-dir=$XORG_PREFIX/lib/X11/config &&
-make &&
-make install</userinput></screen>
+make</userinput></screen>
 
+      <para>Now as the <systemitem class="username">root</systemitem>
+      user:</para>
 
+<screen><userinput role="root">make install</userinput></screen>
+
+
       <para>Finally, build the three remaining packages with the standard build 
       commands:</para>
 
 
 <screen><userinput>./configure $XORG_CONFIG &&
-make &&
-make install</userinput></screen>
+make</userinput></screen>
 
+      <para>Now as the <systemitem class="username">root</systemitem>
+      user:</para>
+
+<screen><userinput role="root">make install</userinput></screen>
+
     </sect3>
 
   </sect2>
@@ -248,10 +264,14 @@
       <para>Install the libraries by running the following commands for each 
       of the chosen packages:</para>
 
-<para><screen><userinput>./configure $XORG_CONFIG &&
-make &&
-make install</userinput></screen></para>
+<screen><userinput>./configure $XORG_CONFIG &&
+make</userinput></screen>
 
+      <para>Now as the <systemitem class="username">root</systemitem>
+      user:</para>
+
+<screen><userinput role="root">make install</userinput></screen>
+
     </sect3>
 
     <sect3 role="configuration">
@@ -298,9 +318,13 @@
       commands:</para>
 
 <screen><userinput>./configure $XORG_CONFIG &&
-make &&
-make install</userinput></screen>
+make</userinput></screen>
 
+      <para>Now as the <systemitem class="username">root</systemitem> 
+      user:</para>
+
+<screen><userinput role="root">make install</userinput></screen>
+
       <note><para>At this point, you should continue to the applications
       installation.  After the applications installation has completed, you
       can use the same instructions above to install the xcursor-themes and
@@ -335,18 +359,41 @@
       chosen package:</para>
 
 <screen><userinput>./configure $XORG_CONFIG &&
-make &&
-make install</userinput></screen>
+make</userinput></screen>
 
+      <para>Now as the <systemitem class="username">root</systemitem> 
+      user:</para>
+
+<screen><userinput role="root">make install</userinput></screen>
+
       <note><para>The luit package should not be compiled at this point.  You
-      should install the luit application after the fonts have been installed.
-      When compiling the luit package, you will need to change a hard 
-      coded reference to /usr/X11R6 in parser.h.  Use the command 
-      "<command>sed -i 's@/usr/X11R6@$XORG_PREFIX@' parser.h</command>" from 
-      the top level of the package source directory.</para></note>
+      should install the luit application after the fonts have been 
+      installed.</para></note>
 
     </sect3>
 
+    <sect3 role="installation">
+
+      <title>Installation of luit</title>
+
+      <para>A patch is required to fix a race condition in
+      <application>luit</application> that was discovered shortly after
+      release.  Download the patch from 
+      <ulink url="&patch-root;/luit_1.0.1-race-1.patch"/>.</para>
+
+      <para>Install luit with the following commands:</para>
+
+<screen><userinput>patch -Np1 -i luit_1.0.1-race-1.patch &&
+./configure $XORG_CONFIG &&
+make</userinput></screen>
+
+      <para>Now as the <systemitem class="username">root</systemitem> 
+      user:</para>
+
+<screen><userinput role="root">make install</userinput></screen>
+
+    </sect3>
+
   </sect2>
 
   <sect2>
@@ -366,22 +413,27 @@
     <sect3 role="installation">
       <title>Installation of Xorg Fonts</title>
 
-      <para>Create a fonts direcorty and a symlink so that the fonts
+      <para>As the <systemitem class="username">root</systemitem> user,
+      create a fonts direcorty and a symlink so that the fonts
       installed in /usr/share/fonts can be accessible by the old fontpath
       $XORG_PREFIX/lib/X11/fonts:</para>
 
 <screen><userinput> mkdir -p /usr/share/fonts &&
-ln -s -v ../../../share/fonts $XORG_PREFIX/lib/X11/</userinput></screen>
+ln -s -v /usr/share/fonts $XORG_PREFIX/lib/X11/</userinput></screen>
 
       <para>Run the following commands for each package:</para>
 
-<note><para>You should install encoding and font-util before all others</para></note>
+      <note><para>You should install encoding and font-util before all 
+      other font packages</para></note>
 
 
-<screen><userinput>./configure $XORG_CONFIG &&
-make &&
-make install</userinput></screen>
+<screen><userinput>./configure $XORG_CONFIG</userinput></screen>
 
+      <para>Now as the <systemitem class="username">root</systemitem>
+      user:</para>
+
+<screen><userinput role="root">make install</userinput></screen>
+
     </sect3>
 
   </sect2>
@@ -414,9 +466,13 @@
     --localstatedir=/var --with-mesa-source='../../Mesa-&mesalib-version;' \
     --with-fontdir=/usr/share/fonts \
     --with-module-dir=$XORG_PREFIX/lib/modules &&
-make &&
-make install</userinput></screen>
+make</userinput></screen>
 
+      <para>Now as the <systemitem class="username">root</systemitem>
+      user:</para>
+
+<screen><userinput role="root">make install</userinput></screen>
+
     </sect3>
 
   </sect2>
@@ -450,9 +506,13 @@
 
 <screen><userinput>./configure $XORG_CONFIG \
     --with-xorg-module-dir=$XORG_PREFIX/lib/modules &&
-make &&
-make install</userinput></screen>
+make</userinput></screen>
 
+      <para>Now as the <systemitem class="username">root</systemitem>
+      user:</para>
+
+<screen><userinput role="root">make install</userinput></screen>
+
     </sect3>
 
   </sect2>

Modified: trunk/BOOK/x/lib/mesalib.xml
===================================================================
--- trunk/BOOK/x/lib/mesalib.xml	2006-03-02 20:43:38 UTC (rev 5698)
+++ trunk/BOOK/x/lib/mesalib.xml	2006-03-03 03:51:21 UTC (rev 5699)
@@ -123,11 +123,19 @@
 <screen role="root"><userinput>install -v -m755 glxinfo glxgears /usr/bin</userinput></screen>
 
     <note>
-      <para>If building Xorg-7.0<!--<xref linkend="xorg7"/>-->, do not 
+      <para>If building <xref linkend="xorg7"/>, do not 
       remove the Mesa source tree yet, it will be required to build the 
       X server.</para>
     </note>
 
+    <para>Finally, if installing to any prefix other than 
+    <filename class="directory">/usr</filename>, you should create symlinks
+    to the GL headers in <filename class="directory">/usr/include</filename>.
+    Execute the following command as the
+    <systemitem class="username">root</systemitem> user:</para>
+
+<screen><userinput role="root">ln -s -v <replaceable>[/usr/X11]</replaceable>/include/GL /usr/include</userinput></screen>
+
   </sect2>
 
   <sect2 role="content">




More information about the blfs-book mailing list