diff -Nru etm-2.3.1.orig/autogen.sh etm-2.3.1/autogen.sh
--- etm-2.3.1.orig/autogen.sh	1970-01-01 01:00:00.000000000 +0100
+++ etm-2.3.1/autogen.sh	2008-09-02 13:19:35.000000000 +0200
@@ -0,0 +1,12 @@
+#! /bin/sh
+
+if [ "$USER" = "root" ]; then
+  echo "You cannot do this as "$USER" please use a normal user account"
+  exit
+fi
+
+libtoolize
+aclocal
+autoheader
+automake --add-missing --foreign
+autoconf
diff -Nru etm-2.3.1.orig/configure.ac etm-2.3.1/configure.ac
--- etm-2.3.1.orig/configure.ac	1970-01-01 01:00:00.000000000 +0100
+++ etm-2.3.1/configure.ac	2008-09-02 13:20:02.000000000 +0200
@@ -0,0 +1,29 @@
+## Bootstrap autoconf/automake
+AC_PREREQ(2.59)
+AC_INIT([etml], [2.3.1], [])
+AC_CANONICAL_TARGET
+AC_CONFIG_SRCDIR([configure.ac])
+AM_INIT_AUTOMAKE
+AM_CONFIG_HEADER([config.h])
+
+## Checks for programs.
+AC_PROG_CC
+AC_PROG_CXX
+AM_PROG_CC_STDC
+AC_PROG_INSTALL
+AC_PROG_MAKE_SET
+AC_PROG_LIBTOOL
+
+PKG_CHECK_MODULES(OGRE, OGRE >= 1.4)
+CXXFLAGS="$CXXFLAGS $OGRE_CFLAGS"
+LIBS="$LIBS $OGRE_LIBS"
+
+# Produce output
+AC_CONFIG_FILES([Makefile
+		src/Makefile
+		include/Makefile
+		ETM.pc
+		])
+AC_OUTPUT
+
+echo "Type 'make' to compile"
diff -Nru etm-2.3.1.orig/ETM.pc.in etm-2.3.1/ETM.pc.in
--- etm-2.3.1.orig/ETM.pc.in	1970-01-01 01:00:00.000000000 +0100
+++ etm-2.3.1/ETM.pc.in	2008-09-02 13:17:39.000000000 +0200
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: ETM
+Description: Editable Terrain Manager for OGRE.
+Requires: OGRE
+Version: @VERSION@
+Libs: -L${libdir} -lEditableTerrain
+Cflags: -I${includedir}/etm
+
diff -Nru etm-2.3.1.orig/include/Makefile.am etm-2.3.1/include/Makefile.am
--- etm-2.3.1.orig/include/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ etm-2.3.1/include/Makefile.am	2008-09-02 13:19:35.000000000 +0200
@@ -0,0 +1,9 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+etmdir = $(includedir)/etm
+
+etm_HEADERS = ETBrush.h \
+		ETPrerequisites.h \
+		ETSplattingManager.h \
+		ETTerrainInfo.h \
+		ETTerrainManager.h
diff -Nru etm-2.3.1.orig/Makefile etm-2.3.1/Makefile
--- etm-2.3.1.orig/Makefile	2007-06-24 07:55:00.000000000 +0200
+++ etm-2.3.1/Makefile	1970-01-01 01:00:00.000000000 +0100
@@ -1,18 +0,0 @@
-INCLUDES=`pkg-config OGRE --cflags` -Iinclude
-LIBS=`pkg-config OGRE --libs`
-CFLAGS=-O2 $(INCLUDES) -fPIC -c
-
-all: src/ETBrush.cpp src/ETIndexHandler.cpp src/ETLightmap.cpp src/ETLoadSaveHeightmap.cpp src/ETSplattingManager.cpp src/ETTerrainInfo.cpp src/ETTerrainManager.cpp src/ETTile.cpp
-	g++ $(CFLAGS) -o obj/ETBrush.o src/ETBrush.cpp
-	g++ $(CFLAGS) -o obj/ETIndexHandler.o src/ETIndexHandler.cpp
-	g++ $(CFLAGS) -o obj/ETLightmap.o src/ETLightmap.cpp
-	g++ $(CFLAGS) -o obj/ETLoadSaveHeightmap.o src/ETLoadSaveHeightmap.cpp
-	g++ $(CFLAGS) -o obj/ETSplattingManager.o src/ETSplattingManager.cpp
-	g++ $(CFLAGS) -o obj/ETTerrainInfo.o src/ETTerrainInfo.cpp
-	g++ $(CFLAGS) -o obj/ETTerrainManager.o src/ETTerrainManager.cpp
-	g++ $(CFLAGS) -o obj/ETTile.o src/ETTile.cpp
-	
-	gcc -shared -o bin/libEditableTerrain.so -fPIC obj/ETBrush.o obj/ETIndexHandler.o obj/ETLightmap.o obj/ETLoadSaveHeightmap.o obj/ETSplattingManager.o obj/ETTerrainInfo.o obj/ETTerrainManager.o obj/ETTile.o
-
-clean:
-	rm bin/libEditableTerrain.so obj/*.o
diff -Nru etm-2.3.1.orig/Makefile.am etm-2.3.1/Makefile.am
--- etm-2.3.1.orig/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ etm-2.3.1/Makefile.am	2008-09-02 13:22:49.000000000 +0200
@@ -0,0 +1,22 @@
+SUBDIRS = src include
+
+MAINTAINERCLEANFILES =	INSTALL \
+			Makefile.in \
+			aclocal.m4 \
+			config.guess \
+			config.h.in \
+			config.h.in~ \
+			stamp-h.in \
+			config.sub \
+			configure \
+			install-sh \
+			missing \
+			mkinstalldirs \
+			ltmain.sh \
+			ltconfig \
+			compile \
+			depcomp
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = ETM.pc
+
diff -Nru etm-2.3.1.orig/Makefile.am~ etm-2.3.1/Makefile.am~
--- etm-2.3.1.orig/Makefile.am~	1970-01-01 01:00:00.000000000 +0100
+++ etm-2.3.1/Makefile.am~	2008-09-02 13:19:35.000000000 +0200
@@ -0,0 +1,18 @@
+SUBDIRS = src include
+
+MAINTAINERCLEANFILES =	INSTALL \
+			Makefile.in \
+			aclocal.m4 \
+			config.guess \
+			config.h.in \
+			config.h.in~ \
+			stamp-h.in \
+			config.sub \
+			configure \
+			install-sh \
+			missing \
+			mkinstalldirs \
+			ltmain.sh \
+			ltconfig \
+			compile \
+			depcomp
diff -Nru etm-2.3.1.orig/src/Makefile.am etm-2.3.1/src/Makefile.am
--- etm-2.3.1.orig/src/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ etm-2.3.1/src/Makefile.am	2008-09-02 13:19:35.000000000 +0200
@@ -0,0 +1,17 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+lib_LTLIBRARIES = libEditableTerrain.la
+
+libEditableTerrain_la_SOURCES = \
+	ETBrush.cpp \
+	ETIndexHandler.cpp \
+	ETLightmap.cpp \
+	ETLoadSaveHeightmap.cpp \
+	ETSplattingManager.cpp \
+	ETTerrainInfo.cpp \
+	ETTerrainManager.cpp \
+	ETTile.cpp
+
+INCLUDES = -I$(top_srcdir)/include -I.
+
+libEditableTerrain_la_LDFLAGS = -version-info 2:0:0