--- Makefile.orig	Thu Oct 19 04:42:53 2000
+++ Makefile	Thu Jul 19 23:07:59 2001
@@ -4,30 +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)\" \
+CFLAGS+=	`$(GTK_CONFIG) --cflags gthread` -DAUXDIR=\"$(AUXDIR)\" \
 	-DINSTALLDIR=\"$(INSTALLDIR)\" -D_REENTRANT
 
 # Link libraries
-LIBS=	`gtk-config --libs gthread`
-ifeq ($(OS), Linux)
-LIBS+=	-lpthread
-endif
-ifeq ($(OS), FreeBSD)
-LIBS+=	-pthread
-endif
+LIBS=	`$(GTK_CONFIG) --libs gthread`
 PARLIBS=	cdparanoia/interface/libcdda_interface.a \
 		cdparanoia/paranoia/libcdda_paranoia.a
 
