--- ./contrib/debugger/Makefile--	Thu Dec 24 00:36:56 1998
+++ ./contrib/debugger/Makefile	Sun Aug  6 11:38:17 2006
@@ -1,19 +1,19 @@
 # Makefile for the Caml Light debugger
 
 # These options are overriden when called from ../Makefile
-CC=cc
+#CC=cc
 OPTS=
-LIBDIR=/usr/local/lib/caml-light
-CPP=/lib/cpp -P
+LIBDIR=${PREFIX}/lib/caml-light
+CPP=/usr/bin/cpp -P
 
 # Compilation options
-CAMLC=camlc
-CAMLLEX=camllex
-CAMLYACC=camlyacc
+CAMLC=${PREFIX}/bin/camlc
+CAMLLEX=${PREFIX}/bin/camllex
+CAMLYACC=${PREFIX}/bin/camlyacc
 INCLUDES=-I ../libunix -I ../../src/compiler -I ../../src/linker -I ../../src/toplevel
 COMPFLAGS=-W $(INCLUDES)
 LINKFLAGS=$(INCLUDES)
-CFLAGS=$(OPTS) -O -I../../src/runtime
+CFLAGS+=$(OPTS) -I../../src/runtime
 
 EXTERNOBJS = \
 	config.zo globals.zo misc.zo interntl.zo \