[pkgsrc/trunk]: pkgsrc/mk Updated mk/ocaml.mk to deal with changes from devel...

[jaapb <jaapb%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3d559d1f15a6
branches:  trunk
changeset: 409356:3d559d1f15a6
user:      jaapb <jaapb%pkgsrc.org@localhost>
date:      Fri Jan 17 09:19:03 2020 +0000

description:
Updated mk/ocaml.mk to deal with changes from devel/ocaml-dune

.install files are now installed somewhere else, I've updated the
ocaml.mk file accordingly.

diffstat:

 mk/ocaml.mk |  9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (44 lines):

diff -r e99ff67eedae -r 3d559d1f15a6 mk/ocaml.mk
--- a/mk/ocaml.mk       Fri Jan 17 09:18:18 2020 +0000
+++ b/mk/ocaml.mk       Fri Jan 17 09:19:03 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ocaml.mk,v 1.26 2019/07/26 09:59:27 tnn Exp $
+# $NetBSD: ocaml.mk,v 1.27 2020/01/17 09:19:03 jaapb Exp $
 #
 # This Makefile fragment handles the common variables used by OCaml packages.
 #
@@ -68,6 +68,7 @@
        DUNE_BUILD_PACKAGES \
        DUNE_BUILD_TARGETS \
        OCAML_BUILD_ARGS \
+       OPAM_INSTALL_DIR \
        OPAM_INSTALL_FILES
 _DEF_VARS.ocaml=       \
        OCAML_USE_OPT_COMPILER
@@ -150,6 +151,7 @@
 .elif ${OCAML_USE_DUNE} == "yes"
 .include "../../devel/ocaml-dune/buildlink3.mk"
 OCAML_USE_OPAM?=       yes
+OPAM_INSTALL_DIR?=     _build/default
 .else
 OCAML_USE_OPAM?=       no
 .endif
@@ -167,6 +169,9 @@
 INSTALLATION_DIRS+=    ${OCAML_SITELIBDIR}/${OCAML_TOPKG_NAME}
 .endif
 
+# Fallback value for OPAM_INSTALL_DIR
+OPAM_INSTALL_DIR?=     .
+
 # Value for OCAML_SITELIBDIR
 OCAML_SITELIBDIR=      lib/ocaml/site-lib
 MAKE_ENV+=     OCAML_SITELIBDIR="${OCAML_SITELIBDIR}"
@@ -257,7 +262,7 @@
                -docdir ${OCAML_TOPKG_DOCDIR}/$$i \
                -stublibsdir ${PREFIX}/${OCAML_SITELIBDIR}/stublibs \
                -bindir ${PREFIX}/bin \
-               $$i.install; \
+               ${OPAM_INSTALL_DIR}/$$i.install; \
        done
 
 .endif # opam