From c3d139977ba446b600bb81c8d66c9997909ebccc Mon Sep 17 00:00:00 2001 From: Stefano Zacchiroli Date: Mon, 29 May 2006 13:49:53 +0000 Subject: [PATCH] OCAMLPATH is no longer overrid if already set in current environment --- Makefile.defs.in | 4 ++++ daemons/http_getter/Makefile | 4 ++++ daemons/proofChecker/Makefile | 6 +++++- daemons/rdfly/Makefile | 6 +++++- daemons/uwobo/Makefile | 4 ++++ daemons/whelp/Makefile | 4 ++++ 6 files changed, 26 insertions(+), 2 deletions(-) diff --git a/Makefile.defs.in b/Makefile.defs.in index ff882055b..804d2489d 100644 --- 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 e8e9280d5..4f0438fde 100644 --- 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 ae957785c..4be11212f 100644 --- 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 87ef3be5f..26e296409 100644 --- 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 dc571a6b9..40434ed49 100644 --- 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 c57e6e1f3..9f5e276e3 100644 --- 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 -- 2.39.2