Updated some files that should be helping users to install The Mana World

instead of sending them in the wrong direction.

2 files changed, 70 insertions, 102 deletions

diff --git a/docs/INSTALL/debian.txt b/docs/INSTALL/debian.txt
index 312d2423..94f4d761 100644
--- a/docs/INSTALL/debian.txt
+++ b/docs/INSTALL/debian.txt
@@ -14,55 +14,80 @@ IRC:      irc.freenode.net / #manaworld
 2) Make the latest Mana World Debian package and install it
 3) Notes
 
-1. Installing The Mana World Dependancies
-=============================================
+
+1. Installing The Mana World Dependencies
+=========================================
 
 The Mana World Debian Package can be installed under the Debian Testing and
 Unstable (Sarge/Cid). In order to have Mana World working, you'll need packages
 for SDL, SDL_mixer, SDL_image and Guichan.
 
 To install libsdldebian1.2, you can do type (as root):
-	apt-get install libsdldebian1.2-all
+
+    apt-get install libsdldebian1.2-all
 
 Also make sure you install the other required packages.
 
-apt-get install libsdl-mixer1.2 libsdl-image1.2
+    apt-get install libsdl-mixer1.2 libsdl-image1.2
 
 Guichan can be found at :
 
 http://guichan.darkbits.org/downloads.shtml
 
 After downloading it, you can install it by typing as root :
-dpkg -i libguichan_0.2.0_i386.deb
+
+    dpkg -i libguichan_0.2.0_i386.deb
 
 
 2. Make the latest Mana World Debian Package and install it
-==========================================================
+===========================================================
+
+  ---------------------------------------------------------------------------
+  NOTE: Instead of creating the Debian package yourself you can also download
+  the latest release from SourceForge. Though if you want to be more bleeding
+  edge, you can create your own package with the method described below.
+  ---------------------------------------------------------------------------
+
+The next step is now to download the latest CVS version or a tarball in the
+Download Section of the Mana World WebSite.  (I think you've got it because
+you're reading this file which is included in, right !)
 
-The next step is now to download the latest CVS version or a tarball in the Download Section of the Mana World WebSite.
-(I think you've got it because you're reading this file which is included in, right !)
+You must have gcc and g++ installed, libsdl1.2-dev, libsdl-mixer1.2-dev,
+libsdl-image1.2-dev, and also libguichan.
 
-you must have gcc and g++ installed, libsdl1.2-dev, libsdl-mixer1.2-dev, libsdl-image1.2-dev, and also libguichan.
 Don't forget them :
-	apt-get install gcc g++ libsdl1.2-dev libsdl-mixer1.2-dev libsdl-image1.2-dev
-	
-Now open a shell and go in the root of the new extracted tarball. You should see a file named GenDeb.sh.
+
+ apt-get install gcc g++ libsdl1.2-dev libsdl-mixer1.2-dev libsdl-image1.2-dev
+
+Now open a shell and go in the root of the new extracted tarball. You should
+see a file named GenDeb.sh.
 Become root,
 Make it executable :
-	chmod +x GenDeb.sh
+
+   chmod +x GenDeb.sh
+
 And now create the Debian Package !!! :
-	./GenDeb.sh
-	
-Let it work : and TADAM !
-The new package should be in the same directory as GenDeb.sh and should be named :
-	manaworld_XXXXXX_i386.deb (XXXXXX is the version number...)
+
+   ./GenDeb.sh
+
+Let it work : and TADAM ! The new package should be in the same directory as
+GenDeb.sh and should be named :
+
+    manaworld_XXXXXX_i386.deb (XXXXXX is the version number...)
+
 Install it :
-	dpkg -i manaworld_XXXXXX_i386.deb
-(If you've got a previous one already installed with the same version number, don't forget to remove it with :)
-	apt-get remove manaworld
-	(Don't worry, you configuration files are not removed...)
-	
-And now the final step : type 'manaworld' as a normal user in a shell and you're in !!!
+
+    dpkg -i manaworld_XXXXXX_i386.deb
+
+(If you've got a previous one already installed with the same version number,
+don't forget to remove it with :)
+
+    apt-get remove manaworld
+
+(Don't worry, you configuration files are not removed...)
+
+And now the final step : type 'manaworld' as a normal user in a shell and
+you're in !!!
 
 (Don't forget : To create a new account, add a '_M' after your account name the first time. After that just type your account name normally...)
 
diff --git a/docs/INSTALL/linux.txt b/docs/INSTALL/linux.txt
index 2035d123..f643b278 100644
--- a/docs/INSTALL/linux.txt
+++ b/docs/INSTALL/linux.txt
@@ -7,95 +7,38 @@ Homepage: themanaworld.sourceforge.net
 IRC:      irc.freenode.net / #manaworld
 
 1) Requirements
-2) Installing the Allegro library
-3) Installing other libraries
-4) Installing The Mana World
-5) Notes
+2) Installing The Mana World
+3) Notes
 
 
 1. Requirements
 ===============
 
-First of all you need a working installation of your favorite GNU/Linux
-distribution. I recommend Debian Sarge/Sid or ArchLinux but you won't listen
-to what i say anyway, eh? ;-)
+To get The Mana World to compile, you need a compile (GCC) and some libraries.
+The required libraries are:
 
-Second you need to have a working version of GCC with the C and C++ compiler
-available. Simply run this to test your if it is installed:
-  For the C compiler:   gcc -v
-  For the C++ compiler: g++ -v
-  
-Both should state a version and other stuff, if not found install them
-both first. Those should be included in any distribution.
+1) SDL             http://www.libsdl.org/
+2) SDL_mixer       http://www.libsdl.org/projects/SDL_mixer/
+3) SDL_image       http://www.libsdl.org/projects/SDL_image/
+4) Guichan 0.2.0   http://guichan.darkbits.org/
 
-To get The Mana World to compile, some libraries are needed:
+Installing these dependencies is distributions-specific, and we'll leave it to
+you to figure this out.
 
-1) Allegro 4.1+
-2) SDL
-3) SDL_mixer
-4) Guichan
 
-
-2. Installing the Allegro Library
-=================================
-
-Look for a package for the distribution you run first and if you find a
-version of Allegro 4.1 or higher you can save the time to go through the
-next steps and skip to section 3. If not read ahead!
-
-Download Allegro:
-  http://prdownloads.sourceforge.net/alleg/allegro-4.1.17.tar.gz?download
-  
-Follow the steps:
-1) cd into the path you donwloaded the tarball to
-2) run "tar xzf allegro-4.1.17.tar.gz"
-3) cd into "allegro-4.1.17"
-4) run "./configure && make"
-5) then make sure you are the superuser and run "make install"
-6) run "ldconfig -v | grep allegro"
-    This should output exaclty one line:
-      "/usr/local/lib/allegro/4.1:"
-    If not check where it was installed to and add the path to your ld
-    config file and run the above command again.
-
-Allegro should now be installed on your system. If libraries are missing
-or something else doesn't work out please correspond to Allegros installation
-manual:
-  http://alleg.sourceforge.net/
-
-
-3. Installing other libraries
-=============================
-
-Make sure you also have SDL, SDL_mixer and Guichan installed.
-
-(incompletely updated by Hammerbear)
-
-  
-4. Installing The Mana World
+2. Installing The Mana World
 ============================
 
-The final step... I assume you have already downloaded the latest tarball
-or checked out a recent version from the CVS. In any case follow the last
-3 steps:
-
-1) cd into the directory you have extracted the source to
-2) run a simple "make"
-3) This should have been it! Now you should be able to run "./ManaWorld"
-   and play the game. If not you are welcome to post your questions on
-   the TMW forums:
-     http://themanaworld.sourceforge.net/phpBB2/index.php
-     
-5. Notes
-========
-
-I only tested this on Archlinux Current (13th July 2004) and Debian Sid
-(13th July 2004) with the most recent packages installed.
+The final step... I assume you have already downloaded the latest tarball or
+checked out a recent version from the CVS. In any case follow the last 3 steps:
 
-If you have any comments regarding this installation howto feel free to
-contact me using the stated email-address on the top of this document.
-But please try the TMW IRC channel first.
+1) Go to the directory you have extracted the source to.
+2) Run "./autogen.sh" (only when using CVS, not when using a source release)
+3) Run "./configure"
+4) Run "make"
 
-That's all folks! Have a nice day! :-)
+It should have generated the executable in src/tmw, you should run it from the
+main directory for it to be able to find its data.
 
-kth5
+If you have any problems, you are welcome to post your questions on our forums,
+or talk about them in our IRC channel.