--- Makefile.orig	2010-03-02 16:42:51.000000000 +0300
+++ Makefile	2010-04-04 05:36:14.000000000 +0400
@@ -11,14 +11,14 @@
 	# to compile on OS X you need to include this Objective C file
 	OSXCOMPAT = SDLMain.m
 else
-	INCLUDES = `sdl-config --cflags` -I/usr/X11R6/include
+	INCLUDES = `sdl-config --cflags`
 	LIBS = `sdl-config --libs` -lGL -lGLU -lSDL_mixer -lSDL_ttf -lSDL_gfx -lSDL_image 
-	CXXFLAGS = -g -c -Wno-deprecated
+	CXXFLAGS += -c -Wno-deprecated
 	OSXCOMPAT = 
 endif
 
 # object files have corresponding source files
-CXX = g++
+CXX ?= g++
 
 all: brainparty