diff options
| author | Olaf Hering <olaf@aepfle.de> | 2013-02-05 11:31:11 +0000 |
|---|---|---|
| committer | Olaf Hering <olaf@aepfle.de> | 2013-02-05 11:31:11 +0000 |
| commit | a2a9b63b48a0f3440929cad1d60c691900430c3d (patch) | |
| tree | ca864d2b64a33ef63275935121c402b083fbbd93 /tools/ocaml/common.make | |
| parent | c23e8e7d5082cbf68611135af24d4a8ec38cb708 (diff) | |
| download | xen-a2a9b63b48a0f3440929cad1d60c691900430c3d.tar.gz xen-a2a9b63b48a0f3440929cad1d60c691900430c3d.tar.bz2 xen-a2a9b63b48a0f3440929cad1d60c691900430c3d.zip | |
tools: update ocamlfind handling
configure checks just for ocamlc, but the tools in tools/ocaml depend
also on ocamlfind. On my workstation I have just ocamlc installed, but
no ocamlfind. As a result make will fail.
Update configure.ac to check also for OCAMLFIND, update various
Makefiles and replace hardcoded ocamlfind string with $(OCAMLFIND)
Please rerun autogen.sh after applying this patch.
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
Diffstat (limited to 'tools/ocaml/common.make')
| -rw-r--r-- | tools/ocaml/common.make | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/ocaml/common.make b/tools/ocaml/common.make index 949433faba..d5478f626f 100644 --- a/tools/ocaml/common.make +++ b/tools/ocaml/common.make @@ -7,6 +7,7 @@ OCAMLMKLIB ?= ocamlmklib OCAMLDEP ?= ocamldep OCAMLLEX ?= ocamllex OCAMLYACC ?= ocamlyacc +OCAMLFIND ?= ocamlfind CFLAGS += -fPIC -Werror -I$(shell ocamlc -where) @@ -16,6 +17,6 @@ OCAMLCFLAGS += -g $(OCAMLINCLUDE) -w F -warn-error F VERSION := 4.1 -OCAMLDESTDIR ?= $(DESTDIR)$(shell ocamlfind printconf destdir) +OCAMLDESTDIR ?= $(DESTDIR)$(shell $(OCAMLFIND) printconf destdir) o= >$@.new && mv -f $@.new $@ |