diff --git a/docs/install.html b/docs/install.html index 2ba7cb8677b..a344c2ca7af 100644 --- a/docs/install.html +++ b/docs/install.html @@ -16,8 +16,7 @@
  • For DRI and hardware acceleration
  • Building with autoconf (Linux/Unix/X11) -
  • Building with SCons (Windows) -
  • Building with legacy Makefiles (deprecated) +
  • Building with SCons (Windows/Linux)
  • Building for other systems
  • Library Information
  • Building OpenGL programs with pkg-config @@ -95,7 +94,7 @@ for more details. -

    3. Building with SCons (Windows)

    +

    3. Building with SCons (Windows/Linux)

    To build Mesa with SCons on Linux or Windows do @@ -129,118 +128,8 @@ Put them all in the same directory to test them. - -

    4. Building with legacy Makefiles (deprecated)

    - -

    -The legacy Mesa build system is based on a collection of pre-defined -system configurations. -Some of these might work for older systems not supported by autoconf. -

    -

    -To see the list of configurations, just type make. -Then choose a configuration from the list and type make -configname. -

    - -

    -Mesa may be built in several different ways using the predefined configurations: -

    - - - -

    -Later, if you want to rebuild for a different configuration run -make realclean before rebuilding. -

    - - - -
    -

    Installing the header and library files

    - -

    -The standard location for the OpenGL header files on Unix-type systems is -in /usr/include/GL/. -The standard location for the libraries is /usr/lib/. -For more information see, the - -Linux/OpenGL ABI specification. -

    - -

    -If you'd like Mesa to co-exist with another implementation of OpenGL that's -already installed, you'll have to choose different directories, like -/usr/local/include/GL/ and /usr/local/lib/. -

    - -

    -To install Mesa's headers and libraries, run make install. -But first, check the Mesa/configs/default file and examine the values -of the INSTALL_DIR and DRI_DRIVER_INSTALL_DIR variables. -Change them if needed, then run make install. -

    - -

    -The variable -DESTDIR may also be used to install the contents to a temporary -staging directory. -This can be useful for package management. -For example: make install DESTDIR=/somepath/ -

    - -

    -Note: at runtime you can use the LD_LIBRARY_PATH environment variable -(on Linux at least) to switch -between the Mesa libraries and other vendor's libraries whenever you want. -This is a handy way to compare multiple OpenGL implementations. -

    - - - - -

    5. Building for other systems

    +

    4. Building for other systems

    Documentation for other environments (some may be very out of date): @@ -255,7 +144,7 @@ Documentation for other environments (some may be very out of date): -

    6. Library Information

    +

    5. Library Information

    When compilation has finished, look in the top-level lib/ @@ -300,7 +189,7 @@ versions of libGL and device drivers. -

    7. Building OpenGL programs with pkg-config

    +

    6. Building OpenGL programs with pkg-config

    Running make install will install package configuration files