--- Makefile.orig	Mon Jun 23 18:30:16 2003
+++ Makefile	Sat Aug  9 16:09:52 2003
@@ -1,11 +1,7 @@
-CC = gcc
-
-INCLUDES = `gtk-config --cflags` -I. -Ifoodock -g
-
-DESTDIR = "/usr/local/bin"
+INCLUDES = `${GTK_CONFIG} --cflags` -I. -Ifoodock
 
 # for normal use
-CFLAGS = -Wall -O2 -ansi -pedantic $(INCLUDES)
+CFLAGS += $(INCLUDES)
 DEBUG = 
 
 # for debuggind purposes
@@ -15,7 +11,7 @@
 #DEBUG = debug.o
 
 
-LFLAGS = `gtk-config --libs`
+LFLAGS = `${GTK_CONFIG} --libs`
 
 
 OBJECTS = wmcliphist.o clipboard.o gui.o rcconfig.o history.o hotkeys.o $(DEBUG)
@@ -27,7 +23,7 @@
 	lclint $(INCLUDES) +posixlib *.c >lclint.log
 
 wmcliphist: $(OBJECTS) foodock/foodock.o
-	$(CC) $(LFLAGS) -o $@ $(OBJECTS) foodock/foodock.o
+	$(CC) $(LFLAGS) -o $@ $(OBJECTS) foodock.o
 
 wmcliphist.o: wmcliphist.c wmcliphist.h \
 	icon/ico_60x60_black.xpm icon/ico_60x60_gray.xpm \