OCAMLPATH is no longer overrid if already set in current environment

[helm.git] / daemons / whelp / Makefile

diff --git a/daemons/whelp/Makefile b/daemons/whelp/Makefile
index c57e6e1f364f5b53e949e2379bc73fb046e75b13..9f5e276e36630bb533a17d75192428e53df1b57c 100644 (file)
--- a/daemons/whelp/Makefile
+++ b/daemons/whelp/Makefile
@@ -1,6 +1,10 @@
 REQUIRES = http helm-grafite_parser helm-logger helm-tactics helm-cic_disambiguation
 OCAMLOPTIONS = -thread -package "$(REQUIRES)" -pp camlp4o
+ifeq ($(origin OCAMLPATH), undefined)
 OCAMLFIND = OCAMLPATH=../../components/METAS ocamlfind
+else
+OCAMLFIND = ocamlfind
+endif
 OCAMLC = $(OCAMLFIND) ocamlc $(OCAMLOPTIONS)
 OCAMLOPT = $(OCAMLFIND) ocamlopt $(OCAMLOPTIONS)
 OCAMLDEP = $(OCAMLFIND) ocamldep -package "$(REQUIRES)" -pp camlp4o