From 4d195c3ad2400605ca79e9dc97b4808286de994d Mon Sep 17 00:00:00 2001 From: Claudio Sacerdoti Coen Date: Mon, 29 May 2006 17:20:16 +0000 Subject: [PATCH] OCAMLPATH is not overrid if already defined --- helm/software/daemons/graphs/tools/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/helm/software/daemons/graphs/tools/Makefile b/helm/software/daemons/graphs/tools/Makefile index bef00fca3..bd473431a 100644 --- a/helm/software/daemons/graphs/tools/Makefile +++ b/helm/software/daemons/graphs/tools/Makefile @@ -6,7 +6,11 @@ SED=cat REQUIRES = http helm-registry PREDICATES = mt 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) OCAMLOPT = $(OCAMLFIND) ocamlopt $(OCAMLOPTIONS) EXECUTABLES = uriSetQueue drawGraph -- 2.39.2