--- Makefile.orig	Sat May 18 17:53:29 2002
+++ Makefile	Sat Jun 22 09:56:19 2002
@@ -14,11 +14,11 @@
 # Added 'install' target (finally!): May 18, 2002
 
 
-DATA_PREFIX=/usr/local/share/gemdropx
-SDL_CFLAGS := $(shell sdl-config --cflags)
-SDL_LDFLAGS := $(shell sdl-config --libs)
-CC=gcc
-CXX=gcc
+DATA_PREFIX=$(PREFIX)/share/gemdropx
+SDL_CFLAGS := $(shell $(SDL_CONFIG) --cflags)
+SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)
+CC?=gcc
+CXX?=gcc
 
 
 MIXER=-lSDL_mixer
@@ -27,7 +27,7 @@
 EMBEDDEDFLAG=NOT_EMBEDDED
 
 
-CFLAGS=-Wall $(SDL_CFLAGS) \
+CFLAGS+=$(SDL_CFLAGS) \
 	-DDATA_PREFIX=\"$(DATA_PREFIX)\" -D$(NOSOUNDFLAG) -D$(JOYFLAG) \
 	-D$(EMBEDDEDFLAG) $(XTRA_FLAGS)
 SDL_LIB=$(MIXER) $(SDL_LDFLAGS)