--- trunk/core/include/kde4.sminc	2009/11/18 20:09:50	4083
+++ trunk/core/include/kde4.sminc	2009/11/18 23:17:22	4090
@@ -59,6 +59,13 @@
 	# use full rpath on non /usr installations
 	[[ ${KDEDIR} != /usr ]] && configure_opts="${configure_opts} -DKDE4_USE_ALWAYS_FULL_RPATH=ON"
 
+	# add akonadi dbus dir
+	if [[ ${PNAME/4/} = akonadi ]] || [[ ${PNAME/4/} = kdepim-runtime ]]
+	then
+		configure_opts="${configure_opts} -DAKONADI_DBUS_INTERFACES_DIR=${PREFIX:-/usr/share/dbus-1/interfaces/}"
+		configure_opts="${configure_opts} -DAKONADI_DBUS_SERVICES_DIR=${PREFIX:-/usr/share/dbus-1/services/}"
+	fi
+
 	# add commandline given arguments
 	configure_opts="${configure_opts} $@"
 
@@ -100,6 +107,16 @@
 	cd ${BUILDDIR}/build
 	mmake DESTDIR=${BINDIR} ${KDE4_MAKE_OPTS} install || die
 
+# 	# move dbus service dirs to a proper location if KDEDIR != /usr
+# 	if [[ ${KDEDIR} != /usr ]]
+# 	then
+# 		if [[ -d ${BINDIR}/${KDEDIR}/share/dbus-1 ]]
+# 		then
+# 			minstalldir /usr/share || die
+# 			mv ${BINDIR}/${KDEDIR}/share/dbus-1 ${BINDIR}/usr/share/ || die
+# 		fi
+# 	fi
+
 	cd ${SRCDIR}
 	local i
 	for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \