View | Details | Raw Unified | Return to bug 189039 | Differences between
and this patch

Collapse All | Expand All

(-)Mk/bsd.ocaml.mk (+10 lines)
Lines 78-83 Link Here
78
#
78
#
79
OCAML_LDCONF?=		${OCAML_LIBDIR}/ld.conf
79
OCAML_LDCONF?=		${OCAML_LIBDIR}/ld.conf
80
80
81
# ocaml-findlib-1.4.1_1 wants to edit our ld.conf file, which does not
82
# work well with staging.
83
.if defined(USE_OCAML_LDCONFIG)
84
. if !target(ocaml-ldconfig)
85
.  if !defined(NO_STAGE)
86
OCAMLFIND_LDCONF?=	/dev/null
87
.  endif
88
. endif
89
.endif
90
81
OCAMLFIND_DESTDIR?=	${PREFIX}/${OCAML_SITELIBDIR}
91
OCAMLFIND_DESTDIR?=	${PREFIX}/${OCAML_SITELIBDIR}
82
OCAMLFIND_LDCONF?=	${PREFIX}/${OCAML_LDCONF}
92
OCAMLFIND_LDCONF?=	${PREFIX}/${OCAML_LDCONF}
83
93

Return to bug 189039