summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ocamldoc/runocamldoc4
-rw-r--r--otherlibs/labltk/tkanim/Makefile5
2 files changed, 5 insertions, 4 deletions
diff --git a/ocamldoc/runocamldoc b/ocamldoc/runocamldoc
index 0f6878f14..64613b6fa 100644
--- a/ocamldoc/runocamldoc
+++ b/ocamldoc/runocamldoc
@@ -2,10 +2,10 @@
case "$1" in
true) shift
- exec ../ocamlrun -I ../otherlibs/unix -I ../otherlibs/str ./ocamldoc $*
+ exec ../boot/ocamlrun -I ../otherlibs/unix -I ../otherlibs/str ./ocamldoc $*
;;
*) shift
exec ./ocamldoc $*
;;
esac
- \ No newline at end of file
+
diff --git a/otherlibs/labltk/tkanim/Makefile b/otherlibs/labltk/tkanim/Makefile
index 288712a82..1af870444 100644
--- a/otherlibs/labltk/tkanim/Makefile
+++ b/otherlibs/labltk/tkanim/Makefile
@@ -1,6 +1,7 @@
include ../support/Makefile.common
-COMPFLAGS=-I ../../../byterun -I ../support -I ../camltk -I ../../unix -ccopt "$(TK_DEFS)"
+COMPFLAGS=-I ../../../byterun -I ../support -I ../camltk -I ../../unix
+CCFLAGS=-I../../../byterun -I../support $(TK_DEFS) $(X11_INCLUDES) $(SHAREDCCCOMPOPTS)
all: tkanim.cma libtkanim.a
opt: tkanim.cmxa libtkanim.a
@@ -47,7 +48,7 @@ clean:
$(CAMLOPT) -c $(COMPFLAGS) $<
.c.o:
- $(CAMLCOMP) -c $(X_CFLAGS) $(COMPFLAGS) $(TCLTKINCLUDES) $<
+ $(BYTECC) $(BYTECCCOMPOPTS) $(CCFLAGS) -c $<
install: tkanim.cma