diff options
| author |   Caleb Tennis <caleb@gentoo.org> | 2004-09-19 16:13:01 +0000 |
|---|---|---|
| committer | Caleb Tennis <caleb@gentoo.org> | 2004-09-19 16:13:01 +0000 |
| commit | 2e03cb9eb4ef33df0c6fba00dcbf2e0f2794eaa3 (patch) | |
| tree | 9e41d6832ac5ec0f94b123f8af4c936ea88a66b1 /eclass | |
| parent | Fixed the overflow patch. Thanks to Florian Schilhabel for input on that. (diff) | |
| download | historical-2e03cb9eb4ef33df0c6fba00dcbf2e0f2794eaa3.tar.gz historical-2e03cb9eb4ef33df0c6fba00dcbf2e0f2794eaa3.tar.bz2 historical-2e03cb9eb4ef33df0c6fba00dcbf2e0f2794eaa3.zip | |
Add xinerama use flag, and correctly set conf dirs - see bug #63637
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde.eclass | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/eclass/kde.eclass b/eclass/kde.eclass index 300b8e486704..6080851e5cbc 100644 --- a/eclass/kde.eclass +++ b/eclass/kde.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.106 2004/09/15 23:10:21 kugelfang Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.107 2004/09/19 16:13:01 caleb Exp $ # # Author Dan Armak <danarmak@gentoo.org> # @@ -12,7 +12,7 @@ ECLASS=kde INHERITED="$INHERITED $ECLASS" DESCRIPTION="Based on the $ECLASS eclass" HOMEPAGE="http://www.kde.org/" -IUSE="${IUSE} debug arts" +IUSE="${IUSE} debug arts xinerama" DEPEND=">=sys-devel/automake-1.7.0 sys-devel/autoconf @@ -80,7 +80,7 @@ kde_src_compile() { case $1 in myconf) debug-print-section myconf - myconf="$myconf --host=${CHOST} --prefix=${PREFIX} --with-x --enable-mitshm --with-xinerama --with-qt-dir=${QTDIR} --enable-mt" + myconf="$myconf --host=${CHOST} --prefix=${PREFIX} --with-x --enable-mitshm $(use_with xinerama) --with-qt-dir=${QTDIR} --enable-mt" # calculate dependencies separately from compiling, enables ccache to work on kde compiles [ -z "$UNSERMAKE" ] && myconf="$myconf --disable-dependency-tracking" if use debug ; then @@ -117,6 +117,13 @@ kde_src_compile() { export KDEDIRS="${PREFIX}:${KDEDIR}" cd $S + + # If we're not a kde-base ebuild, then set up the /usr directories properly + # Perhaps this could get changed later to use econf instead? + if [ $PREFIX = "/usr" ]; then + myconf="${myconf} --mandir=/usr/share/man --infodir=/usr/share/info --datadir=/usr/share --sysconfdir=/etc --localstatedir=/var/lib" + fi + ./configure \ ${myconf} \ --libdir="\${exec_prefix}/$(get_libdir)" \ |