diff options
Diffstat (limited to 'tools/ocaml')
| -rw-r--r-- | tools/ocaml/common.make | 3 | ||||
| -rw-r--r-- | tools/ocaml/libs/eventchn/Makefile | 6 | ||||
| -rw-r--r-- | tools/ocaml/libs/mmap/Makefile | 6 | ||||
| -rw-r--r-- | tools/ocaml/libs/xb/Makefile | 6 | ||||
| -rw-r--r-- | tools/ocaml/libs/xc/Makefile | 6 | ||||
| -rw-r--r-- | tools/ocaml/libs/xl/Makefile | 6 | ||||
| -rw-r--r-- | tools/ocaml/libs/xs/Makefile | 6 |
7 files changed, 20 insertions, 19 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 $@ diff --git a/tools/ocaml/libs/eventchn/Makefile b/tools/ocaml/libs/eventchn/Makefile index 2eb50dc8d5..2d8d6184df 100644 --- a/tools/ocaml/libs/eventchn/Makefile +++ b/tools/ocaml/libs/eventchn/Makefile @@ -24,12 +24,12 @@ OCAML_LIBRARY = xeneventchn .PHONY: install install: $(LIBS) META mkdir -p $(OCAMLDESTDIR) - ocamlfind remove -destdir $(OCAMLDESTDIR) xeneventchn - ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore xeneventchn META $(INTF) $(LIBS) *.a *.so *.cmx + $(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xeneventchn + $(OCAMLFIND) install -destdir $(OCAMLDESTDIR) -ldconf ignore xeneventchn META $(INTF) $(LIBS) *.a *.so *.cmx .PHONY: uninstall uninstall: - ocamlfind remove -destdir $(OCAMLDESTDIR) xeneventchn + $(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xeneventchn include $(TOPLEVEL)/Makefile.rules diff --git a/tools/ocaml/libs/mmap/Makefile b/tools/ocaml/libs/mmap/Makefile index c131948c95..df45819df5 100644 --- a/tools/ocaml/libs/mmap/Makefile +++ b/tools/ocaml/libs/mmap/Makefile @@ -19,12 +19,12 @@ OCAML_LIBRARY = xenmmap .PHONY: install install: $(LIBS) META mkdir -p $(OCAMLDESTDIR) - ocamlfind remove -destdir $(OCAMLDESTDIR) xenmmap - ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore xenmmap META $(INTF) $(LIBS) *.a *.so *.cmx + $(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xenmmap + $(OCAMLFIND) install -destdir $(OCAMLDESTDIR) -ldconf ignore xenmmap META $(INTF) $(LIBS) *.a *.so *.cmx .PHONY: uninstall uninstall: - ocamlfind remove -destdir $(OCAMLDESTDIR) xenmmap + $(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xenmmap include $(TOPLEVEL)/Makefile.rules diff --git a/tools/ocaml/libs/xb/Makefile b/tools/ocaml/libs/xb/Makefile index 35f23438d0..62ffefb666 100644 --- a/tools/ocaml/libs/xb/Makefile +++ b/tools/ocaml/libs/xb/Makefile @@ -45,11 +45,11 @@ xenbus.cmo : $(foreach obj, $(OBJS), $(obj).cmo) .PHONY: install install: $(LIBS) META mkdir -p $(OCAMLDESTDIR) - ocamlfind remove -destdir $(OCAMLDESTDIR) xenbus - ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore xenbus META $(LIBS) xenbus.cmo xenbus.cmi xenbus.cmx *.a *.so + $(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xenbus + $(OCAMLFIND) install -destdir $(OCAMLDESTDIR) -ldconf ignore xenbus META $(LIBS) xenbus.cmo xenbus.cmi xenbus.cmx *.a *.so .PHONY: uninstall uninstall: - ocamlfind remove -destdir $(OCAMLDESTDIR) xenbus + $(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xenbus include $(TOPLEVEL)/Makefile.rules diff --git a/tools/ocaml/libs/xc/Makefile b/tools/ocaml/libs/xc/Makefile index b59b8dfb54..239c1878fe 100644 --- a/tools/ocaml/libs/xc/Makefile +++ b/tools/ocaml/libs/xc/Makefile @@ -23,11 +23,11 @@ libs: $(LIBS) .PHONY: install install: $(LIBS) META mkdir -p $(OCAMLDESTDIR) - ocamlfind remove -destdir $(OCAMLDESTDIR) xenctrl - ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore xenctrl META $(INTF) $(LIBS) *.a *.so *.cmx + $(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xenctrl + $(OCAMLFIND) install -destdir $(OCAMLDESTDIR) -ldconf ignore xenctrl META $(INTF) $(LIBS) *.a *.so *.cmx .PHONY: uninstall uninstall: - ocamlfind remove -destdir $(OCAMLDESTDIR) xenctrl + $(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xenctrl include $(TOPLEVEL)/Makefile.rules diff --git a/tools/ocaml/libs/xl/Makefile b/tools/ocaml/libs/xl/Makefile index fe75abb582..c9e5274ea4 100644 --- a/tools/ocaml/libs/xl/Makefile +++ b/tools/ocaml/libs/xl/Makefile @@ -56,11 +56,11 @@ libs: $(LIBS) .PHONY: install install: $(LIBS) META mkdir -p $(OCAMLDESTDIR) - ocamlfind remove -destdir $(OCAMLDESTDIR) xenlight - ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore xenlight META $(INTF) $(LIBS) *.a *.so *.cmx + $(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xenlight + $(OCAMLFIND) install -destdir $(OCAMLDESTDIR) -ldconf ignore xenlight META $(INTF) $(LIBS) *.a *.so *.cmx .PHONY: uninstall uninstall: - ocamlfind remove -destdir $(OCAMLDESTDIR) xenlight + $(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xenlight include $(TOPLEVEL)/Makefile.rules diff --git a/tools/ocaml/libs/xs/Makefile b/tools/ocaml/libs/xs/Makefile index 2913cae878..7a3d886d7b 100644 --- a/tools/ocaml/libs/xs/Makefile +++ b/tools/ocaml/libs/xs/Makefile @@ -36,12 +36,12 @@ xenstore.cmo : $(foreach obj, $(OBJS), $(obj).cmo) .PHONY: install install: $(LIBS) META mkdir -p $(OCAMLDESTDIR) - ocamlfind remove -destdir $(OCAMLDESTDIR) xenstore - ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore xenstore META $(LIBS) xenstore.cmo xenstore.cmi xenstore.cmx *.a + $(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xenstore + $(OCAMLFIND) install -destdir $(OCAMLDESTDIR) -ldconf ignore xenstore META $(LIBS) xenstore.cmo xenstore.cmi xenstore.cmx *.a .PHONY: uninstall uninstall: - ocamlfind remove -destdir $(OCAMLDESTDIR) xenstore + $(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xenstore include $(TOPLEVEL)/Makefile.rules |