--- src/gtk/Makefile.orig	Tue Feb 18 21:59:04 2003
+++ src/gtk/Makefile	Tue Feb 18 22:01:52 2003
@@ -1,12 +1,12 @@
 
-GUICFLAGS=`gtk-config --cflags`
-GUILDFLAGS=`gtk-config --libs`
+GUICFLAGS=`${GTK_CONFIG} --cflags`
+GUILDFLAGS=`${GTK_CONFIG} --libs`
 
-STDCFLAGS=-O2 -ffast-math -fomit-frame-pointer -Wall
+STDCFLAGS=-O2 -ffast-math -fomit-frame-pointer -Wall -I${LOCALBASE}/include
 # STDCFLAGS=-g -Wall -DROADMAP_DEBUG_HEAP
 # STDCFLAGS=-g -Wall -pg -fprofile-arcs -g
 
-CFLAGS=$(STDCFLAGS) $(GUICFLAGS) -I..
+CFLAGS+=$(STDCFLAGS) $(GUICFLAGS) -I..
 
 RDMLIBS= ../libroadmap.a libgtkroadmap.a ../unix/libosroadmap.a
 LIBS=$(RDMLIBS) $(GUILDFLAGS) -lm
@@ -23,7 +23,7 @@
 
 RUNTIME=gtkroadgps gtkroadmap
 
-INSTALLDIR=/usr/local
+INSTALLDIR=${LOCALBASE}
 
 
 # --- Conventional targets ----------------------------------------
