--- GNUmakefile.orig	Tue Jul 18 21:34:25 2006
+++ GNUmakefile	Thu Jul 20 16:48:27 2006
@@ -3,7 +3,7 @@
 vpath %.m src/SDL:src/Core
 vpath %.h src/SDL:src/Core
 vpath %.c src/SDL:src/Core:src/BSDCompat
-GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_USER_ROOT)
+GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_LOCAL_ROOT)
 ifeq ($(GNUSTEP_HOST_OS),mingw32)
 	ADDITIONAL_INCLUDE_DIRS =
 	ADDITIONAL_OBJC_LIBS = -lglu32 -lopengl32 -lmingw32 -lSDLmain -lSDL -lSDL_mixer -lSDL_image -lgnustep-base
@@ -13,9 +13,9 @@
 	oolite_LIB_DIRS += -L$(GNUSTEP_LOCAL_ROOT)/lib
 else
 	ADDITIONAL_INCLUDE_DIRS = -Isrc/SDL -Isrc/Core -Isrc/BSDCompat
-	ADDITIONAL_OBJC_LIBS = -lGLU -lGL -lSDL -lpthread -lSDL_mixer -lSDL_image -lgnustep-base
-	ADDITIONAL_CFLAGS = -DLINUX -DNEED_STRLCPY `sdl-config --cflags`
-	ADDITIONAL_OBJCFLAGS = -DLOADSAVEGUI -DLINUX -DHAVE_SOUND -Wno-import `sdl-config --cflags`
-	oolite_LIB_DIRS += -L/usr/X11R6/lib/
+	ADDITIONAL_OBJC_LIBS = -lGLU -lGL -lSDL_mixer -lSDL_image -lSDL_gfx -lgnustep-base `sdl-config --libs`
+	ADDITIONAL_CFLAGS = -I${LOCALBASE}/include -DLINUX `sdl-config --cflags`
+	ADDITIONAL_OBJCFLAGS = -I${LOCALBASE}/include -DLOADSAVEGUI -DLINUX -DHAVE_SOUND -Wno-import `sdl-config --cflags`
+	oolite_LIB_DIRS += -L${LOCALBASE}/lib/
 endif
 OBJC_PROGRAM_NAME = oolite