Updated documentation about installing now working. Thanks to dobey!

3 files changed, 6 insertions, 63 deletions

diff --git a/INSTALL b/INSTALL
index d8ea880a..0bc705ab 100644
--- a/INSTALL
+++ b/INSTALL
@@ -32,16 +32,18 @@ Installing these dependencies is distributions-specific, and we'll leave it to
 you to figure this out.
 
 
-2. Compiling The Mana World
-===========================
+2. Compiling And Installing The Mana World
+==========================================
 
 1) Go to the directory you have extracted the source to.
 2) If you checked out from CVS, run "./autogen.sh" to generate configure.
 3) Run "./configure"
 4) Run "make"
+5) Run "make install" as root
 
-It should have generated the executable in src/tmw, you should run it like
-"src/tmw" for it to be able to find its data.
+It should have installed The Mana World on your system now, and you can run it
+with "tmw". By default all files are installed to /usr/local, you can pass a
+different prefix to configure as usual.
 
 
   EXPERIMENTAL: For those people with modern video cards and fast OpenGL
@@ -57,10 +59,6 @@ It should have generated the executable in src/tmw, you should run it like
 3. Notes
 ========
 
-There is at the moment no way to install The Mana World on your sytem, we still
-need to figure out how to make that possible using the GNU autotools. Any help
-on this will be greatly appreciated.
-
 If you have any problems, you are welcome to post your questions on our forums,
 or talk about them in our IRC channel.
 
diff --git a/docs/INSTALL/linux.txt b/docs/INSTALL/linux.txt
deleted file mode 100644
index 7e6a9e58..00000000
--- a/docs/INSTALL/linux.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-How to compile and run TMW on your GNU/Linux Box
-================================================
-
-Homepage: http://themanaworld.sourceforge.net/
-IRC:      irc.freenode.net / #manaworld
-
-1) Requirements
-2) Compiling The Mana World
-3) Notes
-
-
-1. Requirements
-===============
-
-You are expected to have either checked out TMW from CVS or you have downloaded
-a source release. To get The Mana World to compile, you need a compiler (GCC)
-and some libraries. The required libraries are:
-
-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/
-5) libxml2         http://www.xmlsoft.org/
-6) physfs 1.0.0    http://icculus.org/physfs/
-
-If you checked TMW out from CVS you will also need these to compile:
-
-6) GNU automake    http://www.gnu.org/software/automake/
-7) GNU autoconf    http://www.gnu.org/software/autoconf/
-
-Installing these dependencies is distributions-specific, and we'll leave it to
-you to figure this out.
-
-
-2. Compiling The Mana World
-===========================
-
-1) Go to the directory you have extracted the source to.
-2) If you checked out from CVS, run "./autogen.sh" to generate configure.
-3) Run "./configure"
-4) Run "make"
-
-It should have generated the executable in src/tmw, you should run it like
-"src/tmw" for it to be able to find its data.
-
-If this does not work for you try the following: (not recommend)
-
-1) Go to the directory you have extracted the source to.
-2) Run "make -f makefile.static"
-
-Now you should be able to run "./tmw".
-
-If you have any problems, you are welcome to post your questions on our forums,
-or talk about them in our IRC channel.
diff --git a/docs/Makefile.am b/docs/Makefile.am
index aac919b8..256f2fd5 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -7,7 +7,6 @@ EXTRA_DIST = packages.txt \
 	     progression.txt \
 	     INSTALL/debian.txt \
 	     INSTALL/win32.txt \
-	     INSTALL/linux.txt \
 	     meetings/dev-20050204.txt \
 	     meetings/dev-20050211.txt \
 	     meetings/dev-20050218.txt \