From: | "Remi Cardona (remi)" <remi@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in eclass: x-modular.eclass |
Date: | Tue, 03 Mar 2009 16:26:22 |
Message-Id: | E1LeXRk-00089d-5N@stork.gentoo.org |
1 | remi 09/03/03 16:26:20 |
2 | |
3 | Modified: x-modular.eclass |
4 | Log: |
5 | install proto docs in /usr/share/doc/${PF} (fixes bug #164917) |
6 | |
7 | Revision Changes Path |
8 | 1.106 eclass/x-modular.eclass |
9 | |
10 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.106&view=markup |
11 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.106&content-type=text/plain |
12 | diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?r1=1.105&r2=1.106 |
13 | |
14 | Index: x-modular.eclass |
15 | =================================================================== |
16 | RCS file: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v |
17 | retrieving revision 1.105 |
18 | retrieving revision 1.106 |
19 | diff -u -r1.105 -r1.106 |
20 | --- x-modular.eclass 18 Feb 2009 18:40:52 -0000 1.105 |
21 | +++ x-modular.eclass 3 Mar 2009 16:26:20 -0000 1.106 |
22 | @@ -1,6 +1,6 @@ |
23 | # Copyright 1999-2005 Gentoo Foundation |
24 | # Distributed under the terms of the GNU General Public License v2 |
25 | -# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.105 2009/02/18 18:40:52 dberkholz Exp $ |
26 | +# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.106 2009/03/03 16:26:20 remi Exp $ |
27 | # |
28 | # @ECLASS: x-modular.eclass |
29 | # @MAINTAINER: |
30 | @@ -393,10 +393,18 @@ |
31 | # Creates a ChangeLog from git if using live ebuilds. |
32 | x-modular_src_install() { |
33 | # Install everything to ${XDIR} |
34 | - make \ |
35 | - DESTDIR="${D}" \ |
36 | - install \ |
37 | - || die |
38 | + if [[ ${CATEGORY} = x11-proto ]]; then |
39 | + make \ |
40 | + ${PN/proto/}docdir=/usr/share/doc/${PF} \ |
41 | + DESTDIR="${D}" \ |
42 | + install \ |
43 | + || die |
44 | + else |
45 | + make \ |
46 | + DESTDIR="${D}" \ |
47 | + install \ |
48 | + || die |
49 | + fi |
50 | # Shouldn't be necessary in XDIR=/usr |
51 | # einstall forces datadir, so we need to re-force it |
52 | # datadir=${XDIR}/share \ |