--- trunk/core/include/xfce.sminc	2010/08/07 12:21:04	5716
+++ branches/magellan-next/include/xfce.sminc	2011/09/29 20:07:21	9018
@@ -13,10 +13,18 @@
 
 sminclude mtools
 
+case ${PNAME} in
+	thunar-*-plugin)	URISUBDIR="thunar-plugins" ;;
+	xfce4-*-plugin)	URISUBDIR="panel-plugins" ;;
+	parole)			URISUBDIR="apps" ;;
+	*)				URISUBDIR="xfce" ;;
+esac
+
 # default SRC_URIs
 SRC_URI=(
 	${SRC_URI[*]}
-	http://mocha.xfce.org/archive/src/xfce/${PNAME}/${PVER%.*}/${SRCFILE}
+	http://mocha.xfce.org/archive/src/${URISUBDIR}/${PNAME}/$(echo ${PVER} | cut -d. -f1-2)/${SRCFILE}
+	http://archive.xfce.org/src/${URISUBDIR}/${PNAME}/$(echo ${PVER} | cut -d. -f1-2)/${SRCFILE}
 	mirror://${PNAME}/${SRCFILE}
 )
 
@@ -26,7 +34,13 @@
 xfce_configure()
 {
 	local configure_opts="$@"
-	mconfigure ${configure_opts} || die
+	mconfigure \
+		--libexecdir=/usr/$(mlibdir)/${PNAME} \
+		--with-html-dir=/usr/share/doc/${PNAME}-${PVER}/html \
+		--disable-debug \
+		--disable-static \
+		${configure_opts} \
+		|| die
 }
 
 xfce_src_prepare()
@@ -37,7 +51,8 @@
 xfce_src_compile()
 {
 	cd ${SRCDIR}
-	xfce_configure --disable-debug --disable-static || die
+
+	xfce_configure || die
 	mmake ${XFCE_MAKE_OPTS} || die
 }