Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Mon, 26 Oct 2015 12:27:06
Message-Id: 1445862413.229ca41113d1ebcc566d1a4e575579321666bafc.aballier@gentoo
1 commit: 229ca41113d1ebcc566d1a4e575579321666bafc
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 26 12:26:31 2015 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 26 12:26:53 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=229ca411
7
8 eclass: Allow ebuilds to override docdir in oasis.eclass.
9
10 eclass/oasis.eclass | 9 ++++++++-
11 1 file changed, 8 insertions(+), 1 deletion(-)
12
13 diff --git a/eclass/oasis.eclass b/eclass/oasis.eclass
14 index 7dc86f3..7a341ce 100644
15 --- a/eclass/oasis.eclass
16 +++ b/eclass/oasis.eclass
17 @@ -42,6 +42,13 @@
18 # The eclass takes care of setting debug in IUSE.
19 # Set before inheriting the eclass.
20
21 +# @ECLASS-VARIABLE: OASIS_DOC_DIR
22 +# @DESCRIPTION:
23 +# Specify where to install documentation. Default is for ocamldoc HTML.
24 +# Change it before inherit if this is not what you want.
25 +# EPREFIX is automatically prepended.
26 +: ${OASIS_DOC_DIR:="/usr/share/doc/${PF}/html"}
27 +
28 inherit multilib findlib eutils base
29
30 case ${EAPI:-0} in
31 @@ -80,7 +87,7 @@ oasis_src_configure() {
32 ${OASIS_SETUP_COMMAND:-ocaml setup.ml} -configure \
33 --prefix "${EPREFIX}/usr" \
34 --libdir "${EPREFIX}/usr/$(get_libdir)" \
35 - --docdir "${EPREFIX}/usr/share/doc/${PF}/html" \
36 + --docdir "${EPREFIX}${OASIS_DOC_DIR}" \
37 --destdir "${D}" \
38 $(oasis_use_enable ocamlopt is_native) \
39 ${confargs} \