CVS commit: pkgsrc/mk

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

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Fri Sep  8 22:18:46 UTC 2017

Modified Files:
        pkgsrc/mk: ocaml.mk

Log Message:
Moved jbuilder detection forward so it deals with opam properly


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 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.16 pkgsrc/mk/ocaml.mk:1.17
--- pkgsrc/mk/ocaml.mk:1.16     Fri Sep  8 19:09:26 2017
+++ pkgsrc/mk/ocaml.mk  Fri Sep  8 22:18:46 2017
@@ -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 fa
 .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}"