--- Makefile.orig	Wed Jul  2 04:20:18 2003
+++ Makefile	Sun May 23 02:38:59 2004
@@ -13,19 +13,19 @@
 	gwmdesktop.o\
 	gwmtaskview.o\
 	deskguide_applet.o
-INCLUDES= -I. `gnome-config gnomeui gnome --cflags` `gdk-pixbuf-config --cflags` -I/usr/X11/include
-CFLAGS=-Wall -c -g
+INCLUDES= -I. `${GNOME_CONFIG} gnomeui gnome --cflags` `${GDK_PIXBUF_CONFIG} --cflags` -I${X11BASE}/include
+#CFLAGS=-Wall -c -g
 HDR= pixmaps.h gstc.h gwmh.h gwmdesktop.h gwmtaskview.h gwmthumbnail.h deskguide_applet.h config.h
-CPFLAGS=-Wall -O2 
-LIBS=`gnome-config gnomeui gnome --libs` `gdk-pixbuf-config --libs`
+#CPFLAGS=-Wall -O2 
+LIBS=`${GNOME_CONFIG} gnomeui gnome --libs` `${GDK_PIXBUF_CONFIG} --libs`
 
 all: $(TARGET)
 
 $(TARGET): $(OBJ)
-	gcc $(CPFLAGS) -o $(TARGET) $(OBJ) $(LIBS)
+	${CC} $(CPFLAGS) -o $(TARGET) $(OBJ) $(LIBS)
 
 %.o: %.c $(HDR)
-	gcc $(CFLAGS) $(INCLUDES) -c $(*F).c 
+	${CC} $(CFLAGS) $(INCLUDES) -c $(*F).c 
 
 
 EXTRA_DIST = \