diff options
| author | Jonathan Callen <abcd@gentoo.org> | 2011-06-15 00:27:58 -0400 |
|---|---|---|
| committer | Jonathan Callen <abcd@gentoo.org> | 2011-06-15 00:27:58 -0400 |
| commit | 2dead7c5eb140bf7d4d112489853d029d67ddc52 (patch) | |
| tree | 09ee2169a7c229ed401a2dd621824beeb19f2c16 /eclass | |
| parent | 5a5f6248cd9ea138f9d407701ec0d42d02de4653 (diff) | |
| download | kde-2dead7c5eb140bf7d4d112489853d029d67ddc52.tar.gz kde-2dead7c5eb140bf7d4d112489853d029d67ddc52.tar.bz2 kde-2dead7c5eb140bf7d4d112489853d029d67ddc52.zip | |
[eclass] Clean up eclass a bit more
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde4-base.eclass | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 77a64adfb26..1fded42d7aa 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -608,13 +608,12 @@ debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: SRC_URI is ${SRC_URI}" # @ECLASS-VARIABLE: PREFIX # @DESCRIPTION: # Set the installation PREFIX for non kde-base applications. It defaults to /usr. -# kde-base packages go into KDE4 installation directory (KDEDIR) by default. -# No matter the PREFIX, package will be built against KDE installed in KDEDIR. +# kde-base packages go into KDE4 installation directory (/usr). +# No matter the PREFIX, package will be built against KDE installed in /usr. # @FUNCTION: kde4-base_pkg_setup # @DESCRIPTION: -# Do the basic KDEDIR settings and determine with which kde should -# optional applications link +# Do some basic settings kde4-base_pkg_setup() { debug-print-function ${FUNCNAME} "$@" @@ -647,10 +646,8 @@ kde4-base_pkg_setup() { : ${PREFIX:=/usr} EKDEDIR=${EPREFIX}/usr - # Point pkg-config path to KDE *.pc files - export PKG_CONFIG_PATH="${EKDEDIR}/$(get_libdir)/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}}" # Point to correct QT plugins path - QT_PLUGIN_PATH="${EKDEDIR}/$(get_libdir)/kde4/plugins/" + QT_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/kde4/plugins/" # Fix XDG collision with sandbox export XDG_CONFIG_HOME="${T}" @@ -793,7 +790,7 @@ kde4-base_src_configure() { # Use colors QTEST_COLORED=1 - # Shadow existing /usr installations + # Shadow existing installations unset KDEDIRS #qmake -query QT_INSTALL_LIBS unavailable when cross-compiling |