113.24.00-2: fix libdir

3 files changed, 52 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2a6664f625a6..8ffd9027d624 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sat Feb  6 00:49:36 UTC 2016
+# Sat Feb  6 01:04:38 UTC 2016
 pkgbase = ocaml-fieldslib
 	pkgdesc = OCaml record fields as first class values
 	pkgver = 113.24.00
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/janestreet/fieldslib
 	arch = i686
 	arch = x86_64
@@ -15,7 +15,9 @@ pkgbase = ocaml-fieldslib
 	depends = ocaml-type_conv
 	options = !strip
 	source = https://ocaml.janestreet.com/ocaml-core/113.24/files/fieldslib-113.24.00.tar.gz
+	source = libdir.patch
 	md5sums = 3afa341134a5e4e4b583f6c617fa4e72
+	md5sums = 7f0a951f1ac87385272ea7a6dd58762a
 
 pkgname = ocaml-fieldslib
 
diff --git a/PKGBUILD b/PKGBUILD
index 2a753719cb5a..f8782aff12df 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,16 +2,24 @@
 
 pkgname=ocaml-fieldslib
 pkgver=113.24.00
-pkgrel=1
+pkgrel=2
 license=('Apache')
 arch=('i686' 'x86_64')
 pkgdesc="OCaml record fields as first class values "
 url="https://github.com/janestreet/fieldslib"
 depends=('ocaml' 'camlp4' 'ocaml-type_conv')
 makedepends=('ocaml-findlib' 'opam')
-source=("https://ocaml.janestreet.com/ocaml-core/$(echo ${pkgver} | grep -Po "^[0-9]+\.[0-9]+")/files/${pkgname#ocaml-}-${pkgver}.tar.gz")
+source=("https://ocaml.janestreet.com/ocaml-core/$(echo ${pkgver} | grep -Po "^[0-9]+\.[0-9]+")/files/${pkgname#ocaml-}-${pkgver}.tar.gz"
+        "libdir.patch")
 options=('!strip')
-md5sums=('3afa341134a5e4e4b583f6c617fa4e72')
+md5sums=('3afa341134a5e4e4b583f6c617fa4e72'
+         '7f0a951f1ac87385272ea7a6dd58762a')
+
+prepare() {
+  cd "${srcdir}/${pkgname#ocaml-}-${pkgver}"
+
+  patch -Np1 < "${srcdir}/libdir.patch"
+}
 
 build() {
   cd "${srcdir}/${pkgname#ocaml-}-${pkgver}"
@@ -23,5 +31,5 @@ build() {
 package() {
   cd "${srcdir}/${pkgname#ocaml-}-${pkgver}"
 
-  make install PREFIX="${pkgdir}/usr"
+  make install PREFIX="${pkgdir}/usr" LIBDIR="${pkgdir}$(ocamlc -where)"
 }
diff --git a/libdir.patch b/libdir.patch
new file mode 100644
index 000000000000..6284fcd558b0
--- /dev/null
+++ b/libdir.patch
@@ -0,0 +1,36 @@
+diff -aur package.pristine/Makefile package.new/Makefile
+--- package.pristine/Makefile	2016-02-06 01:55:14.650150309 +0100
++++ package.new/Makefile	2016-02-06 01:57:56.012174364 +0100
+@@ -29,26 +29,26 @@
+ 	ocaml -I js-utils js-utils/gen_install.ml
+ 
+ install: $(NAME).install
+-	opam-installer -i --prefix $(PREFIX) $(NAME).install
++	opam-installer -i --prefix $(PREFIX) --libdir $(LIBDIR) $(NAME).install
+ 
+ uninstall: $(NAME).install
+-	opam-installer -u --prefix $(PREFIX) $(NAME).install
++	opam-installer -u --prefix $(PREFIX) --libdir $(LIBDIR) $(NAME).install
+ 
+ reinstall: $(NAME).install
+-	opam-installer -u --prefix $(PREFIX) $(NAME).install &> /dev/null || true
+-	opam-installer -i --prefix $(PREFIX) $(NAME).install
++	opam-installer -u --prefix $(PREFIX) --libdir $(LIBDIR) $(NAME).install &> /dev/null || true
++	opam-installer -i --prefix $(PREFIX) --libdir $(LIBDIR) $(NAME).install
+ 
+ bin.tar.gz: $(NAME).install
+ 	rm -rf _install
+ 	mkdir _install
+-	opam-installer -i --prefix _install $(NAME).install
++	opam-installer -i --prefix _install --libdir $(LIBDIR) $(NAME).install
+ 	tar czf bin.tar.gz -C _install .
+ 	rm -rf _install
+ 
+ bin.lzo: $(NAME).install
+ 	rm -rf _install
+ 	mkdir _install
+-	opam-installer -i --prefix _install $(NAME).install
++	opam-installer -i --prefix _install --libdir $(LIBDIR) $(NAME).install
+ 	cd _install && lzop -1 -P -o ../bin.lzo `find . -type f`
+ 	rm -rf _install
+