--- Setup.orig	Fri Jun 19 17:27:08 1998
+++ Setup	Tue Jun 23 20:33:36 1998
@@ -5,11 +5,11 @@
 # Gist module
 # Change XLIB to the directory where libX11.a is found on your system.
 # Change YORHOME to the directory (--prefix) where Yorick was installed.
-XLIB = /usr/X11R6/lib
-YORHOME = /usr/local
+XLIB = ${X11BASE}/lib
+YORHOME = ${PREFIX}
 GISTH = $(YORHOME)/lib/yorick/1.4/h
 GISTL = $(YORHOME)/lib/yorick/1.4/lib
-gistC Gist/Src/gistCmodule.c -I$(GISTH) -L$(GISTL) -L$(XLIB) -lgist -lX11 -lm
+gistC Gist/Src/gistCmodule.c -I${X11BASE}/include -I$(GISTH) -L$(GISTL) -L$(XLIB) -lgist -lX11 -lm
 
 # Arrayfns module - supports Z. Motteler's 3D additions to pygist
 arrayfns Arrayfcns/Src/arrayfnsmodule.c