-ifeq ($(origin OCAMLPATH), undefined)
-OCAMLFIND = OCAMLPATH=@OCAMLPATH@ @OCAMLFIND@
-else
-OCAMLFIND = @OCAMLFIND@
-endif
+OCAMLPATH := @OCAMLPATH@:$(OCAMLPATH)
+OCAMLFIND = OCAMLPATH=$(OCAMLPATH) @OCAMLFIND@
CAMLP5O = @CAMLP5O@
LABLGLADECC = @LABLGLADECC@
HAVE_OCAMLOPT = @HAVE_OCAMLOPT@