--- Makefile.orig	Thu May 24 01:32:54 2001
+++ Makefile	Sat Aug  4 02:14:03 2001
@@ -22,10 +22,10 @@
 
 
 SAWFISH_CLIENT_LIB_DIR = `rep-config --execdir`/sawfish
-CC = gcc
+#CC = gcc
 
-CFLAGS = -DUSE_SAWFISH_LIBCLIENT
-LDFLAGS = -Wl,-rpath $(SAWFISH_CLIENT_LIB_DIR) $(SAWFISH_CLIENT_LIB_DIR)/client.so
+#CFLAGS = -DUSE_SAWFISH_LIBCLIENT
+#LDFLAGS = -Wl,-rpath $(SAWFISH_CLIENT_LIB_DIR) $(SAWFISH_CLIENT_LIB_DIR)/client.so
 # To not use libclient directly comment out the two above lines and
 #instead use the following lines:
 # CFLAGS =
@@ -34,11 +34,11 @@
 all: spager spager.jlc merlin/message.jlc merlin/util.jlc
 
 spager: spager.o
-	$(CC) -O6 -Wall spager.o $(LDFLAGS) `gtk-config --libs` -o spager
+	$(CC) -Wall spager.o $(LDFLAGS) `${GTK_CONFIG} --libs` -o spager
 	strip spager
 
 spager.o: spager.c
-	$(CC) -c -O6 -Wall $(CFLAGS) `gtk-config --cflags` spager.c
+	$(CC) -c -Wall $(CFLAGS) `${GTK_CONFIG} --cflags` spager.c
 
 spager.jlc: spager.jl
 	sawfish --batch --no-rc compiler -f compile-batch $^