diff options
| author | Maciej Mrozowski (reavertm) <reavertm@poczta.fm> | 2009-06-04 23:08:05 +0200 |
|---|---|---|
| committer | Maciej Mrozowski (reavertm) <reavertm@poczta.fm> | 2009-06-04 23:08:59 +0200 |
| commit | b3e6c9b8f961cdc0005534c91d9528b252b50acf (patch) | |
| tree | fa45b95e0ddf54b41b99744c2005c0f777b3f65d /eclass | |
| parent | 42f4b8b9e64c2777a3bfe038c971a1816e0e780e (diff) | |
| download | kde-b3e6c9b8f961cdc0005534c91d9528b252b50acf.tar.gz kde-b3e6c9b8f961cdc0005534c91d9528b252b50acf.tar.bz2 kde-b3e6c9b8f961cdc0005534c91d9528b252b50acf.zip | |
[eclass] - fix handling KDEDIRS with different KDE_REQUIRED when no kdelibs found
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde4-base.eclass | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 178b185a1fc..358882bd1d0 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -427,10 +427,13 @@ kde4-base_pkg_setup() { done unset slot - # optional kde dont need kdedir if unset - [[ KDE_REQUIRED = optional ]] && ! use kde && KDEDIR="${ROOT}usr" + # Bail out if kdelibs required but not found + if [[ ${KDE_REQUIRED} = always ]] || { [[ ${KDE_REQUIRED} = optional ]] && use kde; }; then + [[ -z ${KDEDIR} ]] && die "Failed to determine KDEDIR!" + else + [[ -z ${KDEDIR} ]] && KDEDIR="${ROOT}usr" + fi - [[ -z ${KDEDIR} ]] && die "Failed to determine KDEDIR!" PREFIX="${PREFIX:-${ROOT}usr}" fi |