diff options
| author |   Caleb Tennis <caleb@gentoo.org> | 2004-08-30 13:30:22 +0000 |
|---|---|---|
| committer | Caleb Tennis <caleb@gentoo.org> | 2004-08-30 13:30:22 +0000 |
| commit | 39111841bab5f444c580d5e6b47871386b9f89eb (patch) | |
| tree | bff40edde72d4106cf3db448645dcf51f30f3611 /eclass/kde-functions.eclass | |
| parent | minor fix (Manifest recommit) (diff) | |
| download | gentoo-2-39111841bab5f444c580d5e6b47871386b9f89eb.tar.gz gentoo-2-39111841bab5f444c580d5e6b47871386b9f89eb.tar.bz2 gentoo-2-39111841bab5f444c580d5e6b47871386b9f89eb.zip | |
Don't set QTDIR if it's already set
Diffstat (limited to 'eclass/kde-functions.eclass')
| -rw-r--r-- | eclass/kde-functions.eclass | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass index dc44741d7bab..dea1eda12232 100644 --- a/eclass/kde-functions.eclass +++ b/eclass/kde-functions.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-functions.eclass,v 1.71 2004/06/25 00:39:48 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.72 2004/08/30 13:30:22 caleb Exp $ # # Author Dan Armak <danarmak@gentoo.org> # @@ -243,7 +243,11 @@ set-qtdir() { done IFS=$IFSBACKUP - export QTDIR="/usr/qt/$QTMAJORVER" + # Don't se the QTDIR if it's already set + # See bug #61967 + if [ ! $QTDIR ]; then + export QTDIR="/usr/qt/$QTMAJORVER" + fi # i'm putting this here so that the maximum amount of qt/kde apps gets it -- danarmak # if $QTDIR/etc/settings/qtrc file exists, the qt build tools try to create |