-OCAMLC = OCAMLPATH="$(METADIR)" $(OCAMLFIND) ocamlc $(COMMONOPTS)
-OCAMLOPT = OCAMLPATH="$(METADIR)" $(OCAMLFIND) ocamlopt $(COMMONOPTS)
-OCAMLDEP = OCAMLPATH="$(METADIR)" $(OCAMLFIND) ocamldep $(COMMONOPTS)
+OCAMLC = $(OCAMLFIND) ocamlc -thread $(COMMONOPTS)
+OCAMLOPT = $(OCAMLFIND) ocamlopt -thread $(COMMONOPTS)
+OCAMLDEP = $(OCAMLFIND) ocamldep $(COMMONOPTS)
OBJS = $(patsubst %,%.cmo,$(MODULES))
OBJSOPT = $(patsubst %,%.cmx,$(MODULES))
OBJS = $(patsubst %,%.cmo,$(MODULES))
OBJSOPT = $(patsubst %,%.cmx,$(MODULES))
$(NAME): $(OBJS) $(NAME).ml
$(OCAMLC) -linkpkg -thread -o $@ $^
$(NAME).opt: $(OBJSOPT) $(NAME).ml
$(NAME): $(OBJS) $(NAME).ml
$(OCAMLC) -linkpkg -thread -o $@ $^
$(NAME).opt: $(OBJSOPT) $(NAME).ml