--- contrib/profiler/Makefile.orig	Thu Dec 24 00:36:56 1998
+++ contrib/profiler/Makefile	Sun Aug  6 13:57:37 2006
@@ -1,9 +1,9 @@
-CPP=/lib/cpp -P
+CPP=/usr/bin/cpp -P
 
-CAMLC=camlc
+CAMLC=${PREFIX}/bin/camlc
 CAMLCOMP=$(CAMLC) -c
-CAMLLEX=camllex
-CAMLYACC=camlyacc
+CAMLLEX=${PREFIX}/bin/camllex
+CAMLYACC=${PREFIX}/bin/camlyacc
 
 COMPFLAGS=-W -g -I ../../src/compiler
 LINKFLAGS=-g -I ../../src/compiler
@@ -27,7 +27,7 @@
 all: camlpro stdlibp.zo prodump.zo
 
 camlpro: $(OBJS)
-	camlc $(LINKFLAGS) -o camlpro $(COMPILEROBJS) $(OBJS)
+	${CAMLC} $(LINKFLAGS) -o camlpro $(COMPILEROBJS) $(OBJS)
 
 camlpro.ml: camlpro.mlp
 	@rm -f camlpro.ml
@@ -35,22 +35,22 @@
 	@chmod -w camlpro.ml
 
 prodump.zo: prodump.ml
-	camlc -c -O none prodump.ml
+	${CAMLC} -c -O none prodump.ml
 
 stdlibp.zo: profiler.ml profiler.mli io.ml
-	camlc -c -O none profiler.mli
-	camlc -c -O none profiler.ml
+	${CAMLC} -c -O none profiler.mli
+	${CAMLC} -c -O none profiler.ml
 	/bin/rm -f io.mli
 	-ln -s ../../src/lib/io.mli ./io.mli
-	camlc -c -O none io.mli
-	camlc -c -O none io.ml
-	camllibr -stdlib ../../src/lib -o stdlibp.zo $(PRO_IMPL)
+	${CAMLC} -c -O none io.mli
+	${CAMLC} -c -O none io.ml
+	${PREFIX}/bin/camllibr -stdlib ../../src/lib -o stdlibp.zo $(PRO_IMPL)
 
 install: 
-	cp camlpro $(LIBDIR)/camlinstr
+	${BSD_INSTALL_SCRIPT} camlpro $(LIBDIR)/camlinstr
 	rm -f $(BINDIR)/camlpro
 	ln -s $(LIBDIR)/camlinstr $(BINDIR)/camlpro
-	cp stdlibp.zo prodump.zo profiler.zi $(LIBDIR)
+	${BSD_INSTALL_DATA} stdlibp.zo prodump.zo profiler.zi $(LIBDIR)
 
 clean:
 	rm -f *.z[oi] camlinstr camlpro io.mli camlpro.ml