diff options
| author | jaapb <jaapb@pkgsrc.org> | 2020-01-17 09:19:03 +0000 |
|---|---|---|
| committer | jaapb <jaapb@pkgsrc.org> | 2020-01-17 09:19:03 +0000 |
| commit | 7e700be052cb87f5f3f8bd24e3c2c9a89124045c (patch) | |
| tree | e0d59699f30da9234e800aba8171751332f0ca0c | |
| parent | 378324106e81e6c5261f567a95674f93fb398635 (diff) | |
| download | pkgsrc-7e700be052cb87f5f3f8bd24e3c2c9a89124045c.tar.gz | |
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.
| -rw-r--r-- | mk/ocaml.mk | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mk/ocaml.mk b/mk/ocaml.mk index 6c326289e57..5f54c42a332 100644 --- a/mk/ocaml.mk +++ b/mk/ocaml.mk @@ -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 |