OCAMLPATH is no longer overrid if already set in current environment

diff --git a/Makefile.defs.in b/Makefile.defs.in
index ff882055b0b9a378846c7eb780c3850233eba3fc..804d2489d372c0253492f420d1983ffee4add6c4 100644 (file)
--- a/Makefile.defs.in
+++ b/Makefile.defs.in
@@ -1,4 +1,8 @@
+ifeq ($(origin OCAMLPATH), undefined)
 OCAMLFIND = OCAMLPATH=@OCAMLPATH@ @OCAMLFIND@
+else
+OCAMLFIND = @OCAMLFIND@
+endif
 CAMLP4O = @CAMLP4O@
 LABLGLADECC = @LABLGLADECC@
 HAVE_OCAMLOPT = @HAVE_OCAMLOPT@

diff --git a/daemons/http_getter/Makefile b/daemons/http_getter/Makefile
index e8e9280d599b02691574414ee925c2d3a29ff7e9..4f0438fde1b5312d760f8196ba469b8c8469656d 100644 (file)
--- a/daemons/http_getter/Makefile
+++ b/daemons/http_getter/Makefile
@@ -3,7 +3,11 @@ NAME = http_getter
 
 REQUIRES = helm-getter helm-logger helm-registry netstring
 COMMONOPTS = -package "$(REQUIRES)" -pp camlp4o -thread
+ifeq ($(origin OCAMLPATH), undefined)
 OCAMLFIND = OCAMLPATH=../../components/METAS ocamlfind
+else
+OCAMLFIND = ocamlfind
+endif
 OCAMLC = $(OCAMLFIND) ocamlc -g $(COMMONOPTS)
 OCAMLOPT = $(OCAMLFIND) opt $(COMMONOPTS)
 

diff --git a/daemons/proofChecker/Makefile b/daemons/proofChecker/Makefile
index ae957785c958da96422ee92064ecfdebf25ef8b1..4be11212f2609333a94bb3c493513d443b375e94 100644 (file)
--- a/daemons/proofChecker/Makefile
+++ b/daemons/proofChecker/Makefile
@@ -2,7 +2,11 @@ BIN_DIR = /usr/local/bin
 REQUIRES = helm-cic_proof_checking http
 PREDICATES =
 OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)" -thread
-OCAMLFIND = OCAMLPATH=../../components/METAS/ ocamlfind
+ifeq ($(origin OCAMLPATH), undefined)
+OCAMLFIND = OCAMLPATH=../../components/METAS ocamlfind
+else
+OCAMLFIND = ocamlfind
+endif
 OCAMLC = $(OCAMLFIND) ocamlc $(OCAMLOPTIONS) -g
 OCAMLOPT = $(OCAMLFIND) ocamlopt $(OCAMLOPTIONS)
 OCAMLDEP = ocamldep

diff --git a/daemons/rdfly/Makefile b/daemons/rdfly/Makefile
index 87ef3be5f66c1335e9cb29531b961e2429b5923e..26e296409b4765f4a31459680df41ff2ee4c5da1 100644 (file)
--- a/daemons/rdfly/Makefile
+++ b/daemons/rdfly/Makefile
@@ -2,7 +2,11 @@ BIN_DIR = /usr/local/bin
 REQUIRES = mysql http helm-registry
 PREDICATES = 
 OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)" -pp camlp4o
-OCAMLFIND = OCAMLPATH=../../components/METAS/ ocamlfind
+ifeq ($(origin OCAMLPATH), undefined)
+OCAMLFIND = OCAMLPATH=../../components/METAS ocamlfind
+else
+OCAMLFIND = ocamlfind
+endif
 OCAMLC = $(OCAMLFIND) ocamlc -thread $(OCAMLOPTIONS)
 OCAMLOPT = $(OCAMLFIND) ocamlopt -thread $(OCAMLOPTIONS)
 OCAMLDEP = ocamldep -pp camlp4o

diff --git a/daemons/uwobo/Makefile b/daemons/uwobo/Makefile
index dc571a6b9d7ca3db3754d7f84f63178da1e4507d..40434ed495580c9d326e5724b675fda869a39e23 100644 (file)
--- a/daemons/uwobo/Makefile
+++ b/daemons/uwobo/Makefile
@@ -3,7 +3,11 @@ DISTDIR = uwobo-$(VERSION)
 DISTTARBALL = $(DISTDIR).tar.gz
 REQUIRES = http gdome2 gdome2-xslt pcre unix helm-registry
 COMMONOPTS = -package "$(REQUIRES)" -pp camlp4o
+ifeq ($(origin OCAMLPATH), undefined)
 OCAMLFIND = OCAMLPATH=../../components/METAS ocamlfind
+else
+OCAMLFIND = ocamlfind
+endif
 OCAMLC = $(OCAMLFIND) ocamlc $(COMMONOPTS)
 OCAMLOPT = $(OCAMLFIND) ocamlopt $(COMMONOPTS)
 OCAMLDEP = $(OCAMLFIND) ocamldep $(COMMONOPTS)

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