diff options
| author |   Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> | 2008-10-11 03:05:37 +0000 |
|---|---|---|
| committer | Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> | 2008-10-11 03:05:37 +0000 |
| commit | b6f376db3322f3135335c800977755a02ec316e9 (patch) | |
| tree | cd6aa205dc5579287588f001279d02402a57e5f6 /eclass | |
| parent | Move live ebuild to using new Git per bug #236145 (diff) | |
| download | gentoo-2-b6f376db3322f3135335c800977755a02ec316e9.tar.gz gentoo-2-b6f376db3322f3135335c800977755a02ec316e9.tar.bz2 gentoo-2-b6f376db3322f3135335c800977755a02ec316e9.zip | |
As we moved KDEDIR setting to pkg_setup, we can't set PREFIX to it in global scope.
Furthermore, now that we have kdeprefix, set PREFIX to KDEDIR in pkg_setup and so make
the install location dependent on kdeprefix for all packages that inherit kde4-base.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde4-base.eclass | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 21a5e7db89df..7b5ef9d94f37 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -1,6 +1,6 @@ # Copyright 2007-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.14 2008/10/04 14:51:02 jmbsvicetto Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.15 2008/10/11 03:05:37 jmbsvicetto Exp $ # @ECLASS: kde4-base.eclass # @MAINTAINER: @@ -388,13 +388,10 @@ kde4-base_pkg_setup() { ;; esac fi - - if [[ -n ${KDEBASE} ]]; then - PREFIX=${KDEDIR} - else - # if PREFIX is not defined we set it to the default value of /usr - PREFIX="${PREFIX:-/usr}" - fi + + # Set the prefix based on KDEDIR + # Make it a consequence of kdeprefix + PREFIX=${KDEDIR} unset _kdedir |