diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-01-24 14:21:05 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-01-24 14:21:05 +0000 |
| commit | 3a35b25909f9e7c315048aa7c958a2b31f24f838 (patch) | |
| tree | 397d8b1b459a1db7b85eabf250a5c2614e123d77 /eclass | |
| parent | 0.10.0_rc1 version bump. (diff) | |
| download | gentoo-2-3a35b25909f9e7c315048aa7c958a2b31f24f838.tar.gz gentoo-2-3a35b25909f9e7c315048aa7c958a2b31f24f838.tar.bz2 gentoo-2-3a35b25909f9e7c315048aa7c958a2b31f24f838.zip | |
For safety, use [[ ]] instead of [ ] for complex checks; replace -a with && to avoid errors with recent bashes.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde.eclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/eclass/kde.eclass b/eclass/kde.eclass index effd325f8fb1..6627c0ff19ce 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.141 2006/01/04 21:55:47 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.142 2006/01/24 14:21:05 flameeyes Exp $ # # Author Dan Armak <danarmak@gentoo.org> # @@ -100,7 +100,7 @@ kde_src_compile() { debug-print-section myconf myconf="$myconf --with-x --enable-mitshm $(use_with xinerama) --with-qt-dir=${QTDIR} --enable-mt --with-qt-libraries=${QTDIR}/$(get_libdir)" # calculate dependencies separately from compiling, enables ccache to work on kde compiles - [ -z "$UNSERMAKE" ] && myconf="$myconf --disable-dependency-tracking" + [[ -z "$UNSERMAKE" ]] && myconf="$myconf --disable-dependency-tracking" if use debug ; then myconf="$myconf --enable-debug=full --with-debug" else @@ -109,8 +109,8 @@ kde_src_compile() { if hasq kdeenablefinal ${IUSE}; then myconf="$myconf $(use_enable kdeenablefinal final)" fi - [ -z "$KDEBASE" ] && myconf="$myconf $(use_with arts)" - [ -n "$KDEBASE" -a "$KDEMINORVER" -ge 3 ] && myconf="$myconf $(use_with arts)" + [[ -z "$KDEBASE" ]] && myconf="$myconf $(use_with arts)" + [[ -n "$KDEBASE" && "$KDEMINORVER" -ge 3 ]] && myconf="$myconf $(use_with arts)" debug-print "$FUNCNAME: myconf: set to ${myconf}" ;; configure) |