diff options
| author | jaapb <jaapb@pkgsrc.org> | 2017-09-08 22:18:46 +0000 |
|---|---|---|
| committer | jaapb <jaapb@pkgsrc.org> | 2017-09-08 22:18:46 +0000 |
| commit | 64984e4af2cfdbe3de60867a0f2f6eca830259be (patch) | |
| tree | 220ae187c9fa87b1a07c362f6ee1932ec6b8d55e /mk | |
| parent | a5e1545c57cdcf05b5a3bd9b127922db14445dda (diff) | |
| download | pkgsrc-64984e4af2cfdbe3de60867a0f2f6eca830259be.tar.gz | |
Moved jbuilder detection forward so it deals with opam properly
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/ocaml.mk | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/mk/ocaml.mk b/mk/ocaml.mk index 75c311c880e..37a474517e4 100644 --- a/mk/ocaml.mk +++ b/mk/ocaml.mk @@ -1,4 +1,4 @@ -# $NetBSD: ocaml.mk,v 1.16 2017/09/08 19:09:26 jaapb Exp $ +# $NetBSD: ocaml.mk,v 1.17 2017/09/08 22:18:46 jaapb Exp $ # # This Makefile fragment handles the common variables used by OCaml packages. # @@ -76,9 +76,6 @@ OCAML_USE_OASIS?= no # Default value of OCAML_USE_OASIS_DYNRUN OCAML_USE_OASIS_DYNRUN?= no -# Default value of OCAML_USE_OPAM -OCAML_USE_OPAM?= no - # Default value of OCAML_USE_TOPKG OCAML_USE_TOPKG?= no @@ -135,6 +132,14 @@ CONFIGURE_ARGS+= --override is_native false .endif .endif +# Configure stuff for JBUILDER +.if ${OCAML_USE_JBUILDER} == "yes" +.include "../../devel/ocaml-jbuilder/buildlink3.mk" +OCAML_USE_OPAM?= yes +.else +OCAML_USE_OPAM?= no +.endif + # Configure stuff for OPAM .if ${OCAML_USE_OPAM} == "yes" .include "../../misc/ocaml-opam/buildlink3.mk" @@ -147,12 +152,6 @@ OCAML_USE_FINDLIB= yes INSTALLATION_DIRS+= ${OCAML_SITELIBDIR}/${OCAML_TOPKG_NAME} .endif -# Configure stuff for JBUILDER -.if ${OCAML_USE_JBUILDER} == "yes" -.include "../../devel/ocaml-jbuilder/buildlink3.mk" -OCAML_USE_OPAM?= yes -.endif - # Value for OCAML_SITELIBDIR OCAML_SITELIBDIR= lib/ocaml/site-lib MAKE_ENV+= OCAML_SITELIBDIR="${OCAML_SITELIBDIR}" |