[pkgsrc/trunk]: pkgsrc/mk Moved jbuilder detection forward so it deals with o...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/43a947d30eca
branches:  trunk
changeset: 367955:43a947d30eca
user:      jaapb <jaapb%pkgsrc.org@localhost>
date:      Fri Sep 08 22:18:46 2017 +0000

description:
Moved jbuilder detection forward so it deals with opam properly

diffstat:

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

diffs (47 lines):

diff -r 991630c1fb63 -r 43a947d30eca mk/ocaml.mk
--- a/mk/ocaml.mk       Fri Sep 08 22:17:57 2017 +0000
+++ b/mk/ocaml.mk       Fri Sep 08 22:18:46 2017 +0000
@@ -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 @@
 # 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 @@
 .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 @@
 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}"