From f71b6b92840a396500aa477a6dba94be4c36d3bb Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Sat, 20 Nov 2010 01:13:13 +0000
Subject: have configure only look for bullet in /usr by default,
 --with-bullet=prefix switch overrides, updated documentation

---
 doc/installation.html | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

(limited to 'doc/installation.html')

diff --git a/doc/installation.html b/doc/installation.html
index 2c3ddfc..cc1ec14 100644
--- a/doc/installation.html
+++ b/doc/installation.html
@@ -173,7 +173,7 @@ unzip ../osirion-data-latest.zip
 	the instructions in <a href="http://ingar.satgnu.net/devenv/mingw32/">this document</a>
 	to create a complete environment, capable of building the Project::OSiRiON source code.
 	You need to install the base system described in part one, and the following packages described
-	in part two: DirectX development files, zlib, SDL, libpng, libjpeg, OpenAL Soft, pdcurses and bullet.
+	in part two: pkg-config, DirectX development files, zlib, SDL, libpng, libjpeg, OpenAL Soft, pdcurses and bullet.
 </p>
 </div>
 
@@ -250,32 +250,31 @@ autoreconf -fi<br>
 ./configure<br>
 </div>
 
-<p>
-	If you do not need the client and want to build the dedicated server only
-	you can pass the <span class="fixed">--without-client</span> option to <span class="fixed">configure</span>:
-</p>
-<div class="code">
-./configure --without-client
-</div>
 <p>
 	Configure will automaticly detect the bullet library if it was installed in 
-	<span class=fixed>/usr</span> or <span class=fixed>/usr/local</span>.
+	<span class=fixed>/usr</span>.
 	If it was installed somewhere else you will have to pass the <span class="fixed">--with-bullet=prefix</span> option
-	to configure. For example, <span class="fixed">--with-bullet=/opt/bullet</span> will use the bullet libraries installed in
-	<span class="fixed">/opt/bullet/lib</span> and the includes in <span class="fixed">/opt/bullet/include/bullet</span>.
+	to configure. For example, <span class="fixed">--with-bullet=/usr/local</span> will use the bullet libraries installed in
+	<span class="fixed">/usr/local/lib</span> and the includes in <span class="fixed">/usr/local/include/bullet</span>.
 	 
 </p>
 <div class="code">
-./configure --with-bullet=/opt/bullet
+./configure --with-bullet=/usr/local
 </div>
 <p>
 	If you add the <span class=fixed>--enable-static-bullet</span> option, the resulting binary will be staticly
 	linked with the bullet libraries. They will work on systems that do not have bullet installed.
 </p>
 <div class="code">
-./configure --with-bullet=/opt/bullet --enable-static-bullet
+./configure --with-bullet=/usr/local --enable-static-bullet
+</div>
+<p>
+	If you do not need the client and want to build the dedicated server only
+	you can pass the <span class="fixed">--without-client</span> option to <span class="fixed">configure</span>:
+</p>
+<div class="code">
+./configure --without-client
 </div>
-
 <p>
 	If <span class="fixed">configure</span> finds ncurses or pdcurses, the dedicated server will use this
 	library and a have a curses console. To disable curses detection, pass the
-- 
cgit v1.2.3