--- Makefile.orig	Wed Apr 19 00:37:44 2000
+++ Makefile	Tue Jul 11 03:58:32 2000
@@ -4,24 +4,24 @@
 OS=$(shell uname -s)
 
 # Compiler
-CC=	gcc
+CC?=	gcc
 
 # Install prefix
-PREFIX=/usr
+PREFIX?=/usr/local
 
 # Installation directory -- where the binary will go
 INSTALLDIR= $(PREFIX)/bin
 
 # Location to store auxilliary files
-AUXDIR= $(PREFIX)/lib/grip
+AUXDIR= $(PREFIX)/etc
 
 
 # Compiler flags
-CFLAGS=	-Wall `gtk-config --cflags` -DAUXDIR=\"$(AUXDIR)\" \
-	-DINSTALLDIR=\"$(INSTALLDIR)\" -D_REENTRANT
+CFLAGS+=	`$(GTK_CONFIG) --cflags` -DAUXDIR=\"$(AUXDIR)\" \
+	-DINSTALLDIR=\"$(INSTALLDIR)\" -D_REENTRANT -D_THREAD_SAFE
 
 # Link libraries
-LIBS=	`gtk-config --libs`
+LIBS=	`$(GTK_CONFIG) --libs`
 ifeq ($(OS), Linux)
 LIBS+=	-lpthread
 endif