--- Makefile.in.orig	Sat Oct 27 02:31:13 2001
+++ Makefile.in	Tue Dec 25 00:02:32 2001
@@ -8,7 +8,7 @@
 PRIVHEADERS = globals.h gtkglobals.h
 GTKFLAGS    = @GTK_CFLAGS@
 GTKLIBS     = @GTK_LIBS@
-CC          = gcc
+CC          ?= gcc
 INSTALL     = @INSTALL@
 PREFIX	   ?= /usr/X11R6
 BINARY      = staticcharge
@@ -16,7 +16,7 @@
 .ifdef DEBUG
 CCFLAGS    += -Wall -g -DDEBUG
 .else
-CCFLAGS    += -Wall -O
+CCFLAGS    += ${CFLAGS} -Wall
 .endif
 
 all: ${BINARY}