--- config.mk.orig	Sat Jun 17 13:44:29 2006
+++ config.mk	Sat Jun 17 19:28:41 2006
@@ -2,8 +2,8 @@
 
 # paths
 PREFIX = /usr/local
-CONFPREFIX = ${PREFIX}/etc
-MANPREFIX = ${PREFIX}/share/man
+CONFPREFIX = ${SYSCONFDIR}
+MANPREFIX = ${PREFIX}/man
 
 X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
@@ -14,7 +14,7 @@ VERSION = 3.1
 LIBS = -L${PREFIX}/lib -L/usr/lib -lc -L${X11LIB} -lX11
 
 # Linux/BSD
-CFLAGS = -O3 -I. -I${PREFIX}/include -I/usr/include -I${X11INC} \
+CFLAGS+= -I. -I${PREFIX}/include -I/usr/include -I${X11INC} \
 	-DVERSION=\"${VERSION}\"
 LDFLAGS = ${LIBS}