update, re-org build/install instructions

diff --git a/docs/install.html b/docs/install.html
index 10688d8ca8a208c925300c754dc01cc17388961c..30565a1dc4f318bb288056366aa5b2b351bf9653 100644 (file)
--- a/docs/install.html
+++ b/docs/install.html
@@ -21,16 +21,53 @@
 <a name="unix-x11">
 <H2>1. Unix/X11 Compilation and Installation</H1>
 
-<h3>1.1 Compilation</h3>
+
+<h3>1.1 Prerequisites for DRI and Hardware Acceleration</h3>
+
+<p>
+To build Mesa with DRI-based hardware acceleration you must first have
+the right version of DRM.
+</p>
+
+<p>
+For Mesa 7.1 a particular snapshot of
+<a href="http://dri.freedesktop.org/libdrm/">DRM</a> from git is required:
+</p>
+
+<pre>
+git-clone git://anongit.freedesktop.org/git/mesa/drm
+git-checkout (XXXX HASH ID TBD)
+</pre>
+</li>
+
+<p>
+You should also be using Xorg server version 1.4
+</p>
+
+
+
+<h3>1.2 Autoconf Compilation</h3>
+
+<p>
+Mesa may be <a href="autoconf.html">built using autoconf</a>.
+This should work well on most GNU-based systems.
+When that fails, the traditional Mesa build system is available.
+
+
+
+<h3>1.3 Traditional Compilation</h3>
+
+<p>
+The traditional Mesa build system is based on a collection of pre-defined
+system configurations.
+</p>
+<p>
+To see the list of configurations, type <b>make</b> alone.
+Then choose a configuration from the list and type <b>make configname</b>.
+</p>
 
 <p>
-Mesa is built by reading Makefile stubs from the configs directory.
-There are configurations for many Unix variants and different Mesa
-options. Type <b>make</b> from the top-level directory to see a list of
-supported system configurations. Alternatively, an autoconf system can
-be used to create a Makefile stub for your system. See the <a
-href="autoconf.html">autoconf instructions</a> for more details. Mesa
-may be compiled in several ways using the predefined configurations:
+Mesa may be built in several different ways using the predefined configurations:
 </p>
 <ul>
 <li><b><em>Stand-alone/Xlib mode</em></b> - Mesa will be compiled as
@@ -55,43 +92,6 @@ accelerated OpenGL rendering (for ATI, Intel, Matrox, etc) will be built.
 The libGL.so library will support the GLX extension and will load/use
 the DRI hardware drivers.
 
-<p>
-<b>Prerequisites:</b>
-</p>
-
-<ol>
-
-<li>
-<p>
-For Mesa 7.0.2 <a href="http://dri.freedesktop.org/libdrm/">
-DRM version 2.3</a> is required.
-</p>
-<p>
-To check if you already have it, run:
-<br>
-<code>pkg-config --modversion libdrm</code>
-</p>
-<p>
-You can download and install a <a href="http://dri.freedesktop.org/libdrm/">
-tarball release</a> or get the code from git with:
-<br>
-<code>git clone git://anongit.freedesktop.org/git/mesa/drm</code>
-<br>
-Then revert to the drm-2.3.0 tag with:
-<br>
-<code>git-reset --hard drm-2.3.0</code>
-</p>
-</li>
-
-<li>
-Relatively recent
-<a href="http://freedesktop.org/wiki/Software_2fXserver" target="_parent">
-X.org</a> release.
-Mesa depends on a number of X header and library files.
-</li>
-
-</ol>
-
 
 <p>
 Build Mesa and the DRI hardware drivers by running
@@ -104,8 +104,13 @@ There are also <code>linux-dri-x86</code>, <code>linux-dri-x86-64</code>,
 and <code>linux-ppc</code> configurations which are optimized for those
 architectures.
 </p>
+<p>
+Make sure you have the prerequisite versions of DRM and Xserver mentioned
+above.
+</p>
 
 </li>
+
 </ul>
 
 
@@ -115,7 +120,7 @@ Later, if you want to rebuild for a different configuration run
 </p>
 
 
-<h3>1.2 The libraries</h3>
+<h3>1.4 The libraries</h3>
 
 <p>
 When compilation has finished, look in the top-level <code>lib/</code>
@@ -156,15 +161,15 @@ lrwxrwxrwx    1 brian    users          23 Mar 26 07:53 libOSMesa.so.6 -> libOSM
 If you built the DRI hardware drivers, you'll also see the DRI drivers:
 </p>
 <pre>
--rwxr-xr-x   1 brian users 15607851 Jul 21 12:11 ffb_dri.so*
--rwxr-xr-x   1 brian users 15148747 Jul 21 12:11 i810_dri.so*
--rwxr-xr-x   1 brian users 14497814 Jul 21 12:11 i830_dri.so*
--rwxr-xr-x   1 brian users 16895413 Jul 21 12:11 i915_dri.so*
+-rwxr-xr-x   1 brian users 15607851 Jul 21 12:11 ffb_dri.so
+-rwxr-xr-x   1 brian users 15148747 Jul 21 12:11 i810_dri.so
+-rwxr-xr-x   1 brian users 14497814 Jul 21 12:11 i830_dri.so
+-rwxr-xr-x   1 brian users 16895413 Jul 21 12:11 i915_dri.so
 -rwxr-xr-x   1 brian users 11320803 Jul 21 12:11 mach64_dri.so
 -rwxr-xr-x   1 brian users 11418014 Jul 21 12:12 mga_dri.so
 -rwxr-xr-x   1 brian users 11064426 Jul 21 12:12 r128_dri.so
 -rwxr-xr-x   1 brian users 11849858 Jul 21 12:12 r200_dri.so
--rwxr-xr-x   1 brian users 16050488 Jul 21 12:11 r300_dri.so*
+-rwxr-xr-x   1 brian users 16050488 Jul 21 12:11 r300_dri.so
 -rwxr-xr-x   1 brian users 11757388 Jul 21 12:12 radeon_dri.so
 -rwxr-xr-x   1 brian users 11232304 Jul 21 12:13 s3v_dri.so
 -rwxr-xr-x   1 brian users 11062970 Jul 21 12:13 savage_dri.so
@@ -175,7 +180,7 @@ If you built the DRI hardware drivers, you'll also see the DRI drivers:
 </pre>
 
 
-<h3>1.3 Running the demos</h3>
+<h3>1.5 Running the demos</h3>
 
 <p>
 If you downloaded/unpacked the MesaDemos-x.y.z.tar.gz archive or
@@ -184,18 +189,15 @@ bunch of demonstration programs.
 </p>
 
 <p>
-Before running a demo, you may have to set an environment variable
-(such as <b>LD_LIBRARY_PATH</b> on Linux) to indicate where the
-libraries are located.  For example:
+Before running a demo, you'll probably have to set two environment variables
+to indicate where the libraries are located.  For example:
 <p>
 <blockquote>
-<b>cd</b> into the Mesa <b>lib/</b> directory.
-<br>
-<b>setenv LD_LIBRARY_PATH ${cwd}</b>   (if using csh or tcsh shell)
+<b>cd lib/</b>
 <br>
-or,
+<b>export LD_LIBRARY_PATH=${PWD}</b>
 <br>
-<b>export LD_LIBRARY_PATH=${PWD}</b>   (if using bash or sh shell)
+<b>export LIBGL_DRIVERS_PATH=${PWD}</b> (if using DRI drivers)
 </blockquote>
 
 <p>
@@ -253,7 +255,7 @@ Retrace your steps if this doesn't look right.
 </p>
 
 
-<H3>1.4 Installing the header and library files</H3>
+<H3>1.6 Installing the header and library files</H3>
 
 <p>
 The standard location for the OpenGL header files on Unix-type systems is
@@ -293,7 +295,7 @@ This is a handy way to compare multiple OpenGL implementations.
 </p>
 
 
-<H3>1.5 pkg-config support</H3>
+<H3>1.7 Building OpenGL Programs With pkg-config</H3>
 
 <p>
 Running <code>make install</code> will install package configuration files