--- trunk/include/kde4.sminc	2014/03/12 16:40:33	21142
+++ trunk/include/kde4.sminc	2014/03/12 16:50:25	21143
@@ -1,13 +1,12 @@
 # $Id$
 
-sminclude mtools cmake qt4
+sminclude mtools cmake qt4 dbus
 msetfeature "!check" # no check target in Makefile
 
 ## some global vars ##
 export KDEDIR=/usr
 export KDECONFDIR=/etc/kde4
 export QT_PLUGIN_PATH=${KDEDIR}/$(mlibdir)/kde4/plugins
-export DBUS_SYSTEM_DIR=/usr/share/dbus-1
 
 # fixes some compile issues ala "kde-config: command not found"
 export PATH="${KDEDIR}/bin:${PATH}"
@@ -101,8 +100,8 @@
 	# add akonadi dbus dir
 	if [[ ${PNAME/4/} = akonadi ]] || [[ ${PNAME/4/} = kdepim-runtime ]]
 	then
-		configure_opts+=" -DAKONADI_DBUS_INTERFACES_DIR=${DBUS_SYSTEM_DIR}/interfaces/"
-		configure_opts+=" -DAKONADI_DBUS_SERVICES_DIR=${DBUS_SYSTEM_DIR}/services/"
+		configure_opts+=" -DAKONADI_DBUS_INTERFACES_DIR=$(mget-dbus-interfaces-dir)"
+		configure_opts+=" -DAKONADI_DBUS_SERVICES_DIR=$(mget-dbus-session-bus-services-dir)"
 	fi
 
 	# add commandline given arguments
@@ -119,10 +118,10 @@
 		-DCMAKE_INSTALL_PREFIX=${KDEDIR} \
 		-DSYSCONF_INSTALL_DIR=${KDECONFDIR} \
 		-DLIB_INSTALL_DIR=${KDEDIR}/$(mlibdir) \
-		-DDBUS_INTERFACES_INSTALL_DIR=${DBUS_SYSTEM_DIR}/interfaces/ \
-		-DDBUS_SERVICES_INSTALL_DIR=${DBUS_SYSTEM_DIR}/services/ \
-		-DKDE4_DBUS_INTERFACES_DIR=${DBUS_SYSTEM_DIR}/interfaces/ \
-		-DKDE4_DBUS_SERVICES_DIR=${DBUS_SYSTEM_DIR}/services/ \
+		-DDBUS_INTERFACES_INSTALL_DIR=$(mget-dbus-interfaces-dir) \
+		-DDBUS_SERVICES_INSTALL_DIR=$(mget-dbus-session-bus-services-dir) \
+		-DKDE4_DBUS_INTERFACES_DIR=$(mget-dbus-interfaces-dir) \
+		-DKDE4_DBUS_SERVICES_DIR=$(mget-dbus-session-bus-services-dir) \
 		-DKDE4_ENABLE_FPIE=ON \
 		-DKDE4_BUILD_TESTS=OFF \
 		-DKDE4_ENABLE_HTMLHANDBOOK=ON \