--- Makefile.orig	Wed Jan  2 23:23:30 2002
+++ Makefile	Sat Jan  5 19:48:56 2002
@@ -35,7 +35,7 @@
 # (Don't bother with this on Windows; I don't have an install target
 # for Windows.)
 # The binaries go into  $(DESTDIR)$(BINDIR)
-DESTDIR = /usr/local/
+DESTDIR = ${PREFIX}/
 BINDIR = bin
 # The man pages go into $(DESTDIR)$(MANDIR)
 MANDIR = man/man1
@@ -59,7 +59,7 @@
 # code (e.g. glib) may provoke warnings.
 # Also, we do NOT enable optimization by default, because RedHat 6
 # Linux distributions have a seriously buggy C compiler.
-CDEBUGFLAGS = -g
+#CDEBUGFLAGS = -g
 # The -Wconversion flag is also useful to detect (more than usual)
 # abuse of enums, but it generates many superfluous warnings, so
 # is not on by default.
@@ -117,7 +117,7 @@
 # don't mess with these
 ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES)
 ALLDEFINES = $(ALLINCLUDES) $(EXTRA_DEFINES) $(DEFINES)
-CFLAGS = $(EXTRA_CFLAGS) $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES)
+CFLAGS += $(EXTRA_CFLAGS) $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES)
 LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS)  $(EXTRA_LDOPTIONS)
 
 # various auxiliary program and settings.