Permalink
Browse files

install xen include files into the ocamlfind area, so no need for roo…

…t by default
  • Loading branch information...
1 parent bc8401a commit 98eba2db601dcd56058cd92df58ae4d1f7d00aa6 @avsm committed Jun 20, 2012
Showing with 4 additions and 5 deletions.
  1. +3 −4 repos/platform/xen/Makefile
  2. +1 −1 repos/skeleton/myocamlbuild.ml
View
7 repos/platform/xen/Makefile
@@ -1,9 +1,8 @@
.PHONY: all clean depend install
-PREFIX ?= /usr/local
-INSTALLDIR := $(DESTDIR)$(PREFIX)
-INCLUDE := $(INSTALLDIR)/include/mirage
-XEN_INCLUDE := $(INCLUDE)/xen
+OCAMLFIND ?= ocamlfind
+
+XEN_INCLUDE = $(shell ocamlfind printconf path)/mirage/include/xen
all:
./cmd configure xen
View
2 repos/skeleton/myocamlbuild.ml
@@ -228,7 +228,7 @@ module Xen = struct
(** Link to a standalone Xen microkernel *)
let cc_xen_link bc tags arg out env =
(* XXX check ocamlfind path here *)
- let xenlib = Util.run_and_read "ocamlfind query mirage" in
+ let xenlib = (Util.run_and_read "ocamlfind query mirage") ^ "/include/xen" in
let jmp_obj = Px (xenlib / "longjmp.o") in
let head_obj = Px (xenlib / "x86_64.o") in
let ocamllib = match bc with |true -> "ocamlbc" |false -> "ocaml" in

0 comments on commit 98eba2d

Please sign in to comment.