--- Makefile.orig	Sat Jan 29 05:02:17 2000
+++ Makefile	Sun Feb 13 13:18:26 2000
@@ -1,21 +1,15 @@
-CXX = c++
 
 NLS=-DENABLE_NLS # Remove or comment this line to disable gettext
-ifeq ($(DEST),)
-DEST=/usr/local
-endif
+DEST?=$(PREFIX)
 LOCALEDIR=$(DEST)/share/locale
 PTHREAD=-lpthread
-GTKCONFIG=gtk-config
 GLIBCONFIG=glib-config
 
 #next strings were added for BSD support
-ifeq ($(OSTYPE),BSD)
 PTHREAD=-pthread
 GTKCONFIG=gtk12-config
-endif
 
-CFLAGS=-Wall -O2 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
+CFLAGS+=-Wall -O2 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
 GTKLIBS=`$(GTKCONFIG) --libs` 
 GTKFLAGS=`$(GTKCONFIG) --cflags` `$(GLIBCONFIG) --cflags`
 LIBS=$(PTHREAD) $(GTKLIBS)