Squashed commit of the following:

commit 1856230d9fa61710cce3e152b8d88b1269611a73
Author: José Fonseca <[email protected]>
Date:   Tue Jul 12 23:41:27 2011 +0100

    make: Use better var names on packaging.

commit d1ae72d0bd14e820ecfe9f8f27b316f9566ceb0c
Author: José Fonseca <[email protected]>
Date:   Tue Jul 12 23:38:21 2011 +0100

    make: Apply several of Dan Nicholson's suggestions.

commit f27cf8743ac9cbf4c0ad66aff0cd3f97efde97e4
Author: José Fonseca <[email protected]>
Date:   Sat Jul 9 14:18:20 2011 +0100

    make: Put back the tar.bz2 creation rule.

    Removed by accident.

commit 34983337f9d7db984e9f0117808274106d262110
Author: José Fonseca <[email protected]>
Date:   Sat Jul 9 11:59:29 2011 +0100

    make: Determine tarballs contents via git ls-files.

    The wildcards were a mess:
    - lots of files for non Linux platforms missing
    - several files listed and archived twice

    Using git-ls-files ensures things are not loss when making the tarballs.

commit 34a28ccbf459ed5710aafba5e7149e8291cb808c
Author: José Fonseca <[email protected]>
Date:   Sat Jul 9 11:07:14 2011 +0100

    glut: Remove GLUT source.

    Most distros ship freeglut, and most people don't care one vs the other,
    and it hasn't been really maintained.

    So it is better to have Mesa GLUT be revisioned and built separately
    from Mesa.

commit 5c26a2c3c0c7e95ef853e19d12d75c4f80137e7d
Author: José Fonseca <[email protected]>
Date:   Sat Jul 9 10:31:02 2011 +0100

    Ignore the tarballs.

commit 26edecac589819f0d0efe2165ab748dbc4e53394
Author: José Fonseca <[email protected]>
Date:   Sat Jul 9 10:30:24 2011 +0100

    make: Create the Mesa-xxx-devel symlink automatically.

    Also actually remote the intermediate uncompressed tarballs.

6 files changed, 9 insertions, 25 deletions

diff --git a/docs/autoconf.html b/docs/autoconf.html
index 936ddcffebb..64bcbd48a67 100644
--- a/docs/autoconf.html
+++ b/docs/autoconf.html
@@ -21,7 +21,6 @@
   <ul>
   <li><a href="#glu">GLU</a></li>
   <li><a href="#glw">GLw</a></li>
-  <li><a href="#glut">GLUT</a></li>
   </ul>
 <li><a href="#demos">Demo Program Options</a></li>
 </ol>
@@ -252,13 +251,6 @@ on all drivers. This can be disable with the option
 if libGLU has been enabled. This can be disable with the option
 <code>--disable-glw</code>.
 </li>
-
-<a name="glut">
-<li><b><em>GLUT</em></b> - The libglut library will be built by default
-if libGLU has been enabled and the glut source code from the MesaGLUT
-tarball is available. This can be disable with the option
-<code>--disable-glut</code>.
-</li>
 </ul>
 </p>
 
diff --git a/docs/devinfo.html b/docs/devinfo.html
index 2d1c125e802..8887dd02624 100644
--- a/docs/devinfo.html
+++ b/docs/devinfo.html
@@ -161,12 +161,6 @@ Then: <code>git push origin mesa_X_Y</code>
 
 <H3>Make the tarballs</H3>
 <p>
-Make a symbolic link from $(DIRECTORY) to 'Mesa'.  For example,
-<code>ln -s Mesa Mesa-7.5</code>
-This is needed in order to make a correct tar file in the next step.
-</p>
-
-<p>
 Make the distribution files.  From inside the Mesa directory:
 <pre>
 	make tarballs
diff --git a/docs/download.html b/docs/download.html
index 03fa60b4dc5..3c4d5976c2c 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -25,9 +25,8 @@ The Mesa package is named MesaLib-x.y.z.{tar.bz2, tar.gz, zip} where x.y.z
 is the version.  There are three types of compressed archives.
 </p>
 <p>
-There's also the MesaGLUT-x.y.z.{tar.bz2, tar.gz, zip} packages which
-contain Mark Kilgard's GLUT library.
-This is optional.
+In the past, there was also MesaGLUT-x.y.z.{tar.bz2, tar.gz, zip} packages which
+contained Mark Kilgard's GLUT library.
 Most Linux distributions include an implementation of GLUT (such as freeglut).
 </p>
 <p>
diff --git a/docs/faq.html b/docs/faq.html
index 65e279aac57..071381c5a1c 100644
--- a/docs/faq.html
+++ b/docs/faq.html
@@ -198,9 +198,9 @@ Mesa's not the solution.
 
 <h2><a name="part2">2.3 Where is the GLUT library?</a></h2>
 <p>
-<a name="part2">GLUT (OpenGL Utility Toolkit) is in the separate MesaGLUT-x.y.z.tar.gz file.
-If you don't already have GLUT installed, you should grab the MesaGLUT
-package and compile it with the rest of Mesa.
+<a name="part2">GLUT (OpenGL Utility Toolkit) is no longer in the separate MesaGLUT-x.y.z.tar.gz file.
+If you don't already have GLUT installed, you should grab 
+<a href="http://freeglut.sourceforge.net/">freeglut</a>.
 </a></p>
 
 
diff --git a/docs/license.html b/docs/license.html
index 44b980d93da..5da8ef1deae 100644
--- a/docs/license.html
+++ b/docs/license.html
@@ -38,10 +38,10 @@ target="_parent">Silicon Graphics Incorporated</a>.
 
 <p>
 The Mesa distribution consists of several components.  Different copyrights
-and licenses apply to different components.  For example, GLUT is copyrighted
-by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa
-device drivers are copyrighted by their authors.  See below for a list of
-Mesa's main components and the license for each.
+and licenses apply to different components.  For example, some demo programs
+are copyrighted by SGI, some of the Mesa device drivers are copyrighted by
+their authors.  See below for a list of Mesa's main components and the license
+for each.
 </p>
 <p>
 The core Mesa library is licensed according to the terms of the MIT license.
diff --git a/docs/sourcetree.html b/docs/sourcetree.html
index 08a9a50e9ec..2e2d1d3f275 100644
--- a/docs/sourcetree.html
+++ b/docs/sourcetree.html
@@ -150,7 +150,6 @@ each directory.
      <li><b>sgi</b> - GLU from SGI
      <li><b>mesa</b> - Mesa version of GLU (deprecated)
      </ul>
-  <li><b>glut</b> - Mark Kilgard's OpenGL OpenGL Utility Toolkit library
   <li><b>glx</b> - The GLX library code for building libGL.  This is used for
          direct rendering drivers.  It will dynamically load one of the 
          xxx_dri.so drivers.