114.33+30

janestreet · Feb 27, 2017 · f384535 · f384535
1 parent 4556057
commit f384535
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -1,14 +1,15 @@
+INSTALL_ARGS := $(if $(PREFIX),--prefix $(PREFIX),)
 NAME := sexplib
 
 # Default rule
 default:
 	jbuilder build-package $(NAME)
 
 install:
-	opam-installer -i --prefix $(PREFIX) $(NAME).install
+	jbuilder install $(INSTALL_ARGS)
 
 uninstall:
-	opam-installer -u --prefix $(PREFIX) $(NAME).install
+	jbuilder uninstall $(INSTALL_ARGS)
 
 reinstall: uninstall reinstall
 

diff --git a/num/lib/jbuild b/num/lib/jbuild
@@ -3,3 +3,5 @@
   (public_name sexplib.num)
   (libraries (num sexplib))
   (preprocess no_preprocessing)))
+
+(jbuild_version jane_street)
diff --git a/sexplib.opam b/sexplib.opam
@@ -6,7 +6,7 @@ bug-reports: "https://github.com/janestreet/sexplib/issues"
 dev-repo: "https://github.com/janestreet/sexplib.git"
 license: "Apache-2.0"
 build: [
-["jbuilder" "build-package" "sexplib" "-j" jobs]
+  ["jbuilder" "build-package" "sexplib" "-j" jobs]
 ]
 depends: [
   "base"

diff --git a/src/jbuild b/src/jbuild
@@ -7,3 +7,5 @@
 
 (ocamllex (lexer))
 (ocamlyacc (parser parser_with_layout))
+
+(jbuild_version jane_street)
diff --git a/test/jbuild b/test/jbuild
@@ -3,3 +3,5 @@
 (library
  ((name sexplib_ounit_tests)
   (libraries (sexplib str unix))))
+
+(jbuild_version jane_street)
diff --git a/unix/lib/jbuild b/unix/lib/jbuild
@@ -3,3 +3,5 @@
   (public_name sexplib.unix)
   (libraries (sexplib unix))
   (preprocess no_preprocessing)))
+
+(jbuild_version jane_street)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,3 +7,5 @@

		(ocamllex (lexer))
		(ocamlyacc (parser parser_with_layout))

		(jbuild_version jane_street)