From: Stefano Zacchiroli <zack@upsilon.cc>
Date: Mon, 29 May 2006 13:49:53 +0000 (+0000)
Subject: OCAMLPATH is no longer overrid if already set in current environment
X-Git-Tag: make_still_working~7310
X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=commitdiff_plain;h=9cb555299fb3bb3c810f20c8cd2e1ebd54f9f3f7;p=helm.git

OCAMLPATH is no longer overrid if already set in current environment
---

diff --git a/helm/software/Makefile.defs.in b/helm/software/Makefile.defs.in
index ff882055b..804d2489d 100644
--- a/helm/software/Makefile.defs.in
+++ b/helm/software/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/helm/software/daemons/http_getter/Makefile b/helm/software/daemons/http_getter/Makefile
index e8e9280d5..4f0438fde 100644
--- a/helm/software/daemons/http_getter/Makefile
+++ b/helm/software/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/helm/software/daemons/proofChecker/Makefile b/helm/software/daemons/proofChecker/Makefile
index ae957785c..4be11212f 100644
--- a/helm/software/daemons/proofChecker/Makefile
+++ b/helm/software/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/helm/software/daemons/rdfly/Makefile b/helm/software/daemons/rdfly/Makefile
index 87ef3be5f..26e296409 100644
--- a/helm/software/daemons/rdfly/Makefile
+++ b/helm/software/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/helm/software/daemons/uwobo/Makefile b/helm/software/daemons/uwobo/Makefile
index dc571a6b9..40434ed49 100644
--- a/helm/software/daemons/uwobo/Makefile
+++ b/helm/software/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/helm/software/daemons/whelp/Makefile b/helm/software/daemons/whelp/Makefile
index c57e6e1f3..9f5e276e3 100644
--- a/helm/software/daemons/whelp/Makefile
+++ b/helm/software/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