--- Makefile.orig	Mon Sep 16 01:37:33 2002
+++ Makefile	Sat Nov  1 21:32:23 2003
@@ -6,9 +6,9 @@
 GNUSTEP_BINDIR = /usr/local/GNUstep/Apps/Mixer.app
 X11_BINDIR = /usr/X11R6/bin
 
-CXX=c++
-CXXFLAGS += -Wall -pedantic -fno-rtti -fno-exceptions -O2 -I/usr/X11R6/include
-LDFLAGS += -L/usr/X11R6/lib -lXpm -lXext -lX11
+CXX?=c++
+CXXFLAGS += -fno-rtti -fno-exceptions -I${X11BASE}/include
+LDFLAGS += -L${X11BASE}/lib -lXpm -lXext -lX11
 
 OBJECTS = Main.o Mixer.o Xpm.o