CVS commit: pkgsrc/mk

["Jaap Boender" <jaapb%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Fri Jan 17 09:19:03 UTC 2020

Modified Files:
        pkgsrc/mk: ocaml.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/mk/ocaml.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/ocaml.mk
diff -u pkgsrc/mk/ocaml.mk:1.26 pkgsrc/mk/ocaml.mk:1.27
--- pkgsrc/mk/ocaml.mk:1.26     Fri Jul 26 09:59:27 2019
+++ pkgsrc/mk/ocaml.mk  Fri Jan 17 09:19:03 2020
@@ -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 @@ _PKG_VARS.ocaml=      \
        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 @@ OCAML_USE_OPAM?=    yes
 .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 @@ OCAML_USE_FINDLIB=  yes
 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 @@ do-install:
                -docdir ${OCAML_TOPKG_DOCDIR}/$$i \
                -stublibsdir ${PREFIX}/${OCAML_SITELIBDIR}/stublibs \
                -bindir ${PREFIX}/bin \
-               $$i.install; \
+               ${OPAM_INSTALL_DIR}/$$i.install; \
        done
 
 .endif # opam