--- Makefile.orig	Sat Jun  5 22:05:36 1999
+++ Makefile	Sat Jul  1 16:10:57 2000
@@ -1,17 +1,17 @@
 # Your favorite compilation options here :-)
-MCFLAGS  = -Wall -O -g 
+#MCFLAGS  = -Wall -O -g 
 LDFLAGS  =  -lcrypt
 
 # Comment out the variables for the databases that you do not want
 # Here, what you need for PostgreSQL
-PGSQLIBS    = -L/usr/local/pgsql/lib -lpq
-PGSQLCFLAGS = -I/usr/local/pgsql/include -DUSE_POSTGRESQL
-PGSQLOBJS   = postgres.o
+#PGSQLIBS    = -L$(LOCALBASE)/lib -lpq
+#PGSQLCFLAGS = -I$(LOCALBASE)/include/postgresql/internal -DUSE_POSTGRESQL
+#PGSQLOBJS   = postgres.o
 
 # Here, what you need for MySQL
-MYSQLIBS    = -L/usr/lib/mysql -lmysqlclient
-MYSQLCFLAGS = -I/usr/include/mysql -DUSE_MYSQL
-MYSQLOBJS   = mysql.o
+#MYSQLIBS    = -L$(LOCALBASE)/lib/mysql -lmysqlclient
+#MYSQLCFLAGS = -I$(LOCALBASE)/include/mysql -DUSE_MYSQL
+#MYSQLOBJS   = mysql.o
 
 # Nothing to change below this point...
 DBSQLIBS = $(PGSQLIBS) $(MYSQLIBS)
@@ -22,13 +22,13 @@
           config.o mytoolbar.o
 
 OBJS    = $(MOBJS) $(DBSQLOBJS)
-CFLAGS  = $(MCFLAGS) $(DBSQLFLAGS)
+CFLAGS  += $(MCFLAGS) $(DBSQLFLAGS)
 
-GTKLIBS     = `gtk-config --libs`
-GTKCFLAGS   = `gtk-config --cflags`
+GTKLIBS     = `$(GTK_CONFIG) --libs`
+GTKCFLAGS   = `$(GTK_CONFIG) --cflags`
 
 all: $(OBJS)
-	gcc -o gtksql $(OBJS) $(DBSQLIBS) $(GTKLIBS) $(CFLAGS) $(LDFLAGS)
+	$(CC) -o gtksql $(OBJS) $(DBSQLIBS) $(GTKLIBS) $(CFLAGS) $(LDFLAGS)
 
 clean:
 	rm -f *.o gtksql
@@ -37,4 +37,4 @@
 	cp gtksql $(DESTDIR)usr/bin/
 
 .c.o: 
-	gcc $(CFLAGS) $(GTKCFLAGS) $(DBSQLCFLAGS) -c $*.c -o ./$*.o
+	$(CC) $(CFLAGS) $(GTKCFLAGS) $(DBSQLCFLAGS) -c $*.c -o ./$*.o