Tue Apr 12 11:27:13 2022 UTC ()
ocaml.mk: try to fix PKGMANDIR support


(tnn)
diff -r1.32 -r1.33 pkgsrc/mk/ocaml.mk
cvs diff -r1.32 -r1.33 pkgsrc/mk/Attic/ocaml.mk (expand / switch to unified diff)

--- pkgsrc/mk/Attic/ocaml.mk 2022/03/03 03:32:28 1.32
+++ pkgsrc/mk/Attic/ocaml.mk 2022/04/12 11:27:13 1.33
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: ocaml.mk,v 1.32 2022/03/03 03:32:28 mrg Exp $ 1# $NetBSD: ocaml.mk,v 1.33 2022/04/12 11:27:13 tnn Exp $
2# 2#
3# This Makefile fragment handles the common variables used by OCaml packages. 3# This Makefile fragment handles the common variables used by OCaml packages.
4# 4#
5# Build def variables: 5# Build def variables:
6# OCAML_USE_OPT_COMPILER  6# OCAML_USE_OPT_COMPILER
7# if set to yes, will enable optimised (native code) compilation 7# if set to yes, will enable optimised (native code) compilation
8# default value: depends on architecture 8# default value: depends on architecture
9# 9#
10# PLIST variable: 10# PLIST variable:
11# PLIST.ocaml-opt for files only installed when using the optimised compiler 11# PLIST.ocaml-opt for files only installed when using the optimised compiler
12# Set based on OCAML_USE_OPT_COMPILER 12# Set based on OCAML_USE_OPT_COMPILER
13#  13#
14# Package-settable variables: 14# Package-settable variables:
@@ -236,36 +236,37 @@ do-install: @@ -236,36 +236,37 @@ do-install:
236# topkg targets 236# topkg targets
237# 237#
238.if ${OCAML_USE_TOPKG} == "yes" 238.if ${OCAML_USE_TOPKG} == "yes"
239 239
240do-build: 240do-build:
241 ${RUN} ${_ULIMIT_CMD} cd ${WRKSRC} && \ 241 ${RUN} ${_ULIMIT_CMD} cd ${WRKSRC} && \
242 ${SETENV} ${MAKE_ENV} ocaml pkg/pkg.ml build ${OCAML_TOPKG_FLAGS} 242 ${SETENV} ${MAKE_ENV} ocaml pkg/pkg.ml build ${OCAML_TOPKG_FLAGS}
243 243
244.endif # topkg 244.endif # topkg
245 245
246# 246#
247# opam targets 247# opam targets
248# 248#
249.if ${OCAML_USE_OPAM} == "yes"  249.if ${OCAML_USE_OPAM} == "yes"
250 250
251do-install: 251do-install:
252 ${RUN} for i in ${OPAM_INSTALL_FILES}; do \ 252 ${RUN} for i in ${OPAM_INSTALL_FILES}; do \
253 cd ${WRKSRC} && opaline -install-cmd "${INSTALL_DATA}" \ 253 cd ${WRKSRC} && opaline -install-cmd "${INSTALL_DATA}" \
254 -exec-install-cmd "${INSTALL_PROGRAM}" \ 254 -exec-install-cmd "${INSTALL_PROGRAM}" \
255 -name $$i \ 255 -name $$i \
256 -destdir ${DESTDIR} \ 256 -destdir ${DESTDIR} \
257 -prefix ${PREFIX} \ 257 -prefix ${PREFIX} \
258 -libdir ${PREFIX}/${OCAML_SITELIBDIR} \ 258 -libdir ${PREFIX}/${OCAML_SITELIBDIR} \
 259 -mandir ${PREFIX}/${PKGMANDIR} \
259 -docdir ${OCAML_TOPKG_DOCDIR}/$$i \ 260 -docdir ${OCAML_TOPKG_DOCDIR}/$$i \
260 -stublibsdir ${PREFIX}/${OCAML_SITELIBDIR}/stublibs \ 261 -stublibsdir ${PREFIX}/${OCAML_SITELIBDIR}/stublibs \
261 -bindir ${PREFIX}/bin \ 262 -bindir ${PREFIX}/bin \
262 ${OPAM_INSTALL_DIR}/$$i.install; \ 263 ${OPAM_INSTALL_DIR}/$$i.install; \
263 done 264 done
264 265
265.endif # opam 266.endif # opam
266 267
267# 268#
268# dune targets 269# dune targets
269# 270#
270.if ${OCAML_USE_DUNE} == "yes" 271.if ${OCAML_USE_DUNE} == "yes"
271 272