Merge pull request #104 from mirage/fix-esy

Fix esy installation
mirage · Aug 4, 2020 · 3077386 · 3077386
2 parents bb675a4 + f1c9c70
commit 3077386
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/digestif.opam b/digestif.opam
@@ -50,7 +50,7 @@ depends: [
   "astring"        {with-test}
   "fpath"          {with-test}
   "rresult"        {with-test}
-  "ocamlfind"      {build & with-test}
+  "ocamlfind"      {with-test}
 ]
 
 depopts: [

diff --git a/install/install.ml b/install/install.ml
@@ -1,18 +1,18 @@
 #!/usr/bin/env ocaml
 
 ;;
-#use "topfind"
-
-;;
-#require "unix"
+#load "unix.cma"
 
 let xen = "xen_linkopts = \"-l:rakia/xen/librakia_xen_stubs.a\""
 
 let freestanding =
   "freestanding_linkopts = \
    \"-l:rakia/freestanding/librakia_freestanding_stubs.a\""
 
-let meta = "_build/default/META.digestif"
+let meta =
+  match Sys.getenv "DUNE_BUILD_DIR" with
+  | _build -> _build ^ "/default/META.digestif"
+  | exception Not_found -> "_build/default/META.digestif"
 
 let new_line = '\n'