--- ./contrib/libgraph/Makefile--	Thu Dec 24 00:36:55 1998
+++ ./contrib/libgraph/Makefile	Sun Aug  6 11:37:59 2006
@@ -1,17 +1,17 @@
 # Makefile for the portable graphics library
 
 # These options are overriden when called from ../Makefile
-CC=cc
+#CC=cc
 OPTS=
-X11_INCLUDES=/usr/include
-X11_LIB=/usr/lib
-CPP=/lib/cpp -P
+X11_INCLUDES=${X11BASE}
+X11_LIB=${X11BASE}/lib
+CPP=/usr/bin/cpp -P
 
-BINDIR=/usr/local/bin
-LIBDIR=/usr/local/lib/caml-light
+BINDIR=${PREFIX}/bin
+LIBDIR=${PREFIX}/lib/caml-light
 
 # Compilation options
-CFLAGS=$(OPTS) -I../../src/runtime -I$(X11_INCLUDES) -O
+CFLAGS+=$(OPTS) -I../../src/runtime -I$(X11_INCLUDES)
 
 # Test to see whether ranlib exists on the machine
 RANLIBTEST=test -f /usr/bin/ranlib -o -f /bin/ranlib
@@ -20,8 +20,8 @@
 RANLIB=ranlib
 
 # The Caml Light compilers
-CAMLC=camlc
-CAMLMKTOP=camlmktop
+CAMLC=${PREFIX}/bin/camlc
+CAMLMKTOP=${PREFIX}/bin/camlmktop
 COMPFLAGS=-W -I ../libunix
 
 OBJS=open.o draw.o fill.o color.o text.o \