From 74031d8f7d91fe70d0ae447d74a12c5206ea9b62 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Fri, 8 Feb 2008 19:24:55 +0000
Subject: minor cleanups

---
 INSTALL      |  6 ++++--
 ROADMAP      |  1 +
 configure.in | 35 +++++++++++++++++++++--------------
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/INSTALL b/INSTALL
index 62061b3..5ec6c90 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,8 +4,10 @@ Installation
 	To build the Osirion Project from source code you will need 
 	the SDL and OpenGL library and header files.
 
-	In theory, it should compile on any platform supported by SDL,
-	but at the time of writing only linux is supported.
+
+	In theory, it should compile on any POSIX-compatible platform 
+	supported by SDL, but at the time of writing only linux is 
+	supported. 
 
 	I have succesfully compiled it on the following platforms:
 		linux-x86_64, gcc 4.1.2, SDL 1.2.11 
diff --git a/ROADMAP b/ROADMAP
index 8855011..2ced47d 100644
--- a/ROADMAP
+++ b/ROADMAP
@@ -25,6 +25,7 @@ client::
 
 render::
 	render pipelines
+	pipeline for Lines AlphaLines Quads AlphaQuads Characters
 
 * VERSION 0.1
 
diff --git a/configure.in b/configure.in
index d59ae64..83aa028 100644
--- a/configure.in
+++ b/configure.in
@@ -141,26 +141,33 @@ dnl   Installation paths
 
 test "$prefix" = "NONE" && prefix="/opt/games/$PACKAGE"
 
-BINDIR="$prefix"
-LIBDIR="$prefix/lib"
-AC_DEFINE_UNQUOTED(LIBDIR, "$LIBDIR",
-	[Define this to the path containing the game libraries.]
+PACKAGE_PREFIX="$prefix"
+PACKAGE_BINDIR="$prefix/bin"
+PACKAGE_DATADIR="$prefix/data"
+PACKAGE_LIBDIR="$prefix/lib"
+
+AC_DEFINE_UNQUOTED(PACKAGE_PREFIX, "$PACKAGE_PREFIX",
+	[Define this to the path where the game will be installed.]
+)
+
+AC_DEFINE_UNQUOTED(PACKAGE_BINDIR, "$PACKAGE_BINDIR",
+	[Define this to the path containing the game binaries.]
 )
 
-DATADIR="$prefix/data"
-AC_DEFINE_UNQUOTED(DATADIR, "$DATADIR",
+AC_DEFINE_UNQUOTED(PACKAGE_DATADIR, "$PACKAGE_DATADIR",
 	[Define this to the path containing the game data.]
 )
 
-AC_SUBST(BINDIR)
-AC_SUBST(LIBDIR)
-AC_SUBST(DATATDIR)
+AC_DEFINE_UNQUOTED(PACKAGE_LIBDIR, "$PACKAGE_LIBDIR",
+	[Define this to the path containing the game libraries.]
+)
 
 dnl ---------------------------------------------------------------
 dnl    Write makefiles and config.h
 
 AC_OUTPUT(Makefile src/Makefile src/client/Makefile src/core/Makefile \
-	src/filesystem/Makefile src/game/Makefile src/math/Makefile src/render/Makefile src/server/Makefile \
+	src/filesystem/Makefile src/game/Makefile src/math/Makefile \
+	src/render/Makefile src/server/Makefile \
 	src/sys/Makefile)
 
 dnl ---------------------------------------------------------------
@@ -174,9 +181,9 @@ Configuration summary:
 	flags .............. $CXXFLAGS
 
 Installation directories:
-	prefix ............. $prefix
-	binaries ........... $BINDIR
-	libraries .......... $LIBDIR
-	data ............... $DATADIR
+	prefix ............. $PACKAGE_PREFIX
+	binaries ........... $PACKAGE_BINDIR
+	libraries .......... $PACKAGE_LIBDIR
+	data ............... $PACKAGE_DATADIR
 ])
 
-- 
cgit v1.2.3