--- Makefile.orig	Wed Aug 30 13:27:11 2000
+++ Makefile	Mon Apr 30 00:49:33 2001
@@ -2,8 +2,8 @@
 # Copyright (C) 2000 Cameron Edwards
 
 # Change these to the default location of the pixmaps/wav files:
-XPMSPATH = /usr/share/pixmaps/sonicmail
-WAVSPATH = /usr/share/sound/sonicmail
+XPMSPATH = ${PREFIX}/share/gnome/pixmaps/sonicmail
+WAVSPATH = ${PREFIX}/share/gnome/sounds/sonicmail
 
 # Change to 1 to activate debug mode:
 SONICMAIL_DEBUG = 0
@@ -32,8 +32,8 @@
 net.o: net.c net.h
 sound.o: sound.c sound.h
 
-CC = gcc
-LINKER = gcc
+#CC = gcc
+LINKER = $(CC)
 
 # defines:
 DEFINES = -DXPMSPATH=\"$(XPMSPATH)\" -DWAVSPATH=\"$(WAVSPATH)\" \
@@ -41,9 +41,9 @@
 
 
 # Common compile options/link options here:
-CFLAGS = -Wall $($(OSTYPE)_Flags) -O2 `gnome-config --cflags applets` $(DEFINES)
+CFLAGS += -Wall $($(OSTYPE)_Flags) `gnome-config --cflags applets` $(DEFINES)
 
-LFLAGS = `gnome-config --libs applets` `gtk-config --libs gthread` -lpthread
+LFLAGS = `gnome-config --libs applets` `${GTK_CONFIG} --libs gthread`
 
 # Define platform specific flags/libraries below:
 Linux_Flags = -DLINUX