diff options
| author | Maciej Mrozowski (reavertm) <reavertm@poczta.fm> | 2009-02-11 17:40:39 +0100 |
|---|---|---|
| committer | Maciej Mrozowski (reavertm) <reavertm@poczta.fm> | 2009-02-11 17:40:39 +0100 |
| commit | bfe199b516ce1ce6b4700ce448f15aae0b688cac (patch) | |
| tree | fa9d8f993c13c8532a4498d540d1437ae3e23c65 /eclass/kde4-functions.eclass | |
| parent | d2ad12c942bc7003dfbffaf169da857fdc9624f2 (diff) | |
| download | kde-bfe199b516ce1ce6b4700ce448f15aae0b688cac.tar.gz kde-bfe199b516ce1ce6b4700ce448f15aae0b688cac.tar.bz2 kde-bfe199b516ce1ce6b4700ce448f15aae0b688cac.zip | |
Some eclass kdeprefix fixes:
- cmake should look in KDEDIR first - to pick libraries from valid KDE installation when more are present
- detect kdeprefix KDE location only for kde-misc packages (when NEED_KDE is specified) - kde-base packages should just...
install to its KDEDIR right?
Diffstat (limited to 'eclass/kde4-functions.eclass')
| -rw-r--r-- | eclass/kde4-functions.eclass | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index 632ef1681c8..02687f9b978 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -64,7 +64,7 @@ buildsycoca() { ebegin "Running kbuildsycoca4 to build global database" # This is needed because we support multiple kde versions installed together. - XDG_DATA_DIRS="/usr/share:${KDEDIRS//:/\/share:}/share:/usr/local/share" \ + XDG_DATA_DIRS="/usr/share:${KDEDIR}/share:/usr/local/share" \ DISPLAY="" DBUS_SESSION_BUS_ADDRESS="" \ ${KDEDIR}/bin/kbuildsycoca4 --global --noincremental &> /dev/null eend $? @@ -229,7 +229,7 @@ get_latest_kdedir() { case ${KDE_WANTED} in # note this will need to be updated as stable moves and so on live) - _versions="9999 4.2.61 4.2.0 4.10" + _versions="9999 4.2.61 4.2.0 4.1.0" ;; snapshot) _versions="4.2.61 4.2.0 4.1.0 9999" @@ -267,6 +267,8 @@ get_latest_kdedir() { esac fi done + + debug-print-function ${FUNCNAME} "$@" "KDE_WANTED=${KDE_WANTED} -> _kdedir=${_kdedir}" } # @FUNCTION: migrate_store_dir |