removed AC_CONFIG_MACRO_DIR(m4) from configure,

updated installation instructions

3 files changed, 15 insertions, 13 deletions

diff --git a/Makefile.am b/Makefile.am
index 07835a3..13a6b8e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,5 @@
 # have all needed files, that a GNU package needs
 AUTOMAKE_OPTIONS = foreign 1.4
 
-ACLOCAL_AMFLAGS = -I m4
-
 SUBDIRS = src
 
diff --git a/configure.in b/configure.in
index e33b46b..3fadb1b 100644
--- a/configure.in
+++ b/configure.in
@@ -16,8 +16,6 @@ AC_LANG_CPLUSPLUS
 AC_PROG_CXX
 AM_PROG_LIBTOOL
 
-AC_CONFIG_MACRO_DIR([m4])
-
 dnl KDE_FIND_PATH(programm-name, variable-name, list of directories,
 dnl     if-not-found, test-parameter)
 AC_DEFUN([KDE_FIND_PATH],
diff --git a/doc/installation.html b/doc/installation.html
index 0e06100..2c3ddfc 100644
--- a/doc/installation.html
+++ b/doc/installation.html
@@ -172,6 +172,8 @@ unzip ../osirion-data-latest.zip
 	You can build the source on windows using a MinGW/MSYS environment. You can use
 	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.
 </p>
 </div>
 
@@ -429,10 +431,11 @@ enginepath_linux="/home/user/osirion/data"
 </div>
 <div class="text">
 <p>
-	The .xcf and .svg source files used to create the game data
-	can also be downloaded. Note that you do not need these files
-	to play the game or to create .map models. You only have to 
-	download them them if you want to create new game graphics.
+	There is a seperate repository for files that are used to
+	create the game data, like blender, gimp or vector graphics files.
+	It is not necessary to download these files to play the game,
+	but if you are interested in contributing to the game you
+	might want to get them.
 </p>
 <p>
 	To download the source data from the subversion repository:
@@ -447,7 +450,10 @@ Organization of the distribution
 </div>
 <div class="text">
 <pre>
-/doc 	Documentation
+/developer
+	Developer documentation
+
+/doc 	User documentation
 
 	index.html		Documentation content
 	installation.html	Installation instructions (this file)
@@ -474,11 +480,11 @@ Organization of the distribution
 /data	Data files
 
 	/base			game data files
-		/bitmaps	essential bitmaps
-		/ini		game world description files
-		/maps		3D models (map format)
+		/bitmaps	essential textures
+		/ini		game world definitions
+		/maps		3D models (.map format)
 		/materials	material definitions
-		/models		3D models (ase and other formats)
+		/models		3D models (.ase and other formats)
 		/particles	particle definitions
 		/textures	game world textures