[arch-commits] Commit in dune/trunk (PKGBUILD)

[Bruno Pagani]

    Date: Sunday, November 25, 2018 @ 10:26:34
  Author: archange
Revision: 409685

upgpkg: dune 1.5.1-1

DESTDIR is now supported.
Man page installation is almost fixed.

Modified:
  dune/trunk/PKGBUILD

----------+
 PKGBUILD |   15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-25 10:24:16 UTC (rev 409684)
+++ PKGBUILD	2018-11-25 10:26:34 UTC (rev 409685)
@@ -2,8 +2,8 @@
 # Contributor: Jakob Gahde <j5lx at fmail.co.uk>
 
 pkgname=dune
-pkgver=1.4.0
-pkgrel=2
+pkgver=1.5.1
+pkgrel=1
 pkgdesc="A composable build system for OCaml (formerly jbuilder)"
 arch=('x86_64')
 url="https://github.com/ocaml/dune"
@@ -13,7 +13,7 @@
 conflicts=('jbuilder')
 replaces=('jbuilder')
 source=(${pkgname}-${pkgver}.tar.gz::"${url}/archive/${pkgver}.tar.gz")
-sha256sums=('d71b484c602160c3a20453aae10ac4562878a5a8b43a8202b0f4a0f8c2648b4c')
+sha256sums=('fb7fe87ab6c3b4097512a0357629ca1cb9422e0593bd61cc255ab4a1a2aaad50')
 
 build() {
     cd ${pkgname}-${pkgver}
@@ -29,17 +29,10 @@
 package() {
     cd ${pkgname}-${pkgver}
 
-    # Work around the install command
-    export OCAMLFIND_DESTDIR="${pkgdir}$(ocamlfind printconf destdir)"
-    install -dm755 ${OCAMLFIND_DESTDIR}
-    make INSTALL_ARGS="--prefix='${pkgdir}'/usr --libdir='${OCAMLFIND_DESTDIR}'" install
+    make DESTDIR="${pkgdir}" INSTALL_ARGS="--prefix=/usr --libdir='$(ocamlfind printconf destdir)'" install
 
     # Fix doc and man install
     rm -r "${pkgdir}"/usr/doc
     install -dm755 "${pkgdir}"/usr/share
     mv "${pkgdir}"/usr/{man,share/}
-    # FS#60288
-    install -dm755 "${pkgdir}"/usr/share/man/man{1,5}
-    mv "${pkgdir}"/usr/share/man/{*.1,man1}
-    mv "${pkgdir}"/usr/share/man/{dune-config.5,man5}
 }