--- trunk/include/mtools.sminc	2012/06/26 15:41:10	12654
+++ trunk/include/mtools.sminc	2012/06/26 16:15:58	12655
@@ -150,6 +150,7 @@
 {
 	local udevrule
 	local file
+	local udevrulesddir="/usr/lib/udev/rules.d"
 
 	[[ -z "$1" ]] && die "No udev rule given"
 
@@ -169,16 +170,17 @@
 	fi
 
 	# needed directory
-	install -d ${BINDIR}/lib/udev/rules.d || die
+	install -d ${BINDIR}${udevrulesddir} || die
 
 	# install our udev rule
-	install -v -m 0644 -o root -g root ${file} ${BINDIR}/lib/udev/rules.d/${udevrule} || die
+	install -v -m 0644 -o root -g root ${file} ${BINDIR}${udevrulesddir}/${udevrule} || die
 }
 
 minstalludevhelper()
 {
 	local udevhelper
 	local file
+	local udevdir="/usr/lib/udev"
 
 	[[ -z "$1" ]] && die "No udev helper given"
 
@@ -198,10 +200,10 @@
 	fi
 
 	# needed directory
-	install -d ${BINDIR}/lib/udev || die
+	install -d ${BINDIR}${udevdir} || die
 
 	# install our udev-helper
-	install -v -m 0755 -o root -g root ${file} ${BINDIR}/lib/udev/${udevhelper} || die
+	install -v -m 0755 -o root -g root ${file} ${BINDIR}${udevdir}/${udevhelper} || die
 }
 
 minstallhalinformation()
@@ -794,14 +796,10 @@
 {
 	local unit
 	local file
-	local prefix
+	local systemdunitdir="/usr/lib/systemd/system"
 
 	[[ -z "$1" ]] && die "No unit given"
 
-	# get the right prefix for newer systemd
-	[[ -x /bin/systemctl ]] && prefix=""
-	[[ -x /usr/bin/systemctl ]] && prefix="/usr"
-
 	# if no fullpath given use file from sourcedir
 	if [[ -z $(dirname $1) ]] || [[ $(dirname $1) = . ]]
 	then
@@ -818,10 +816,10 @@
 	fi
 
 	# needed directory
-	install -d ${BINDIR}${prefix}/lib/systemd/system || die
+	install -d ${BINDIR}${prefix}${systemdunitdir} || die
 
 	# install our initscript
-	install -v -m 0644 -o root -g root ${file} ${BINDIR}${prefix}/lib/systemd/system/${unit} || die
+	install -v -m 0644 -o root -g root ${file} ${BINDIR}${prefix}${systemdunitdir}/${unit} || die
 }
 
 # installs systemd tmp configs to /etc/tmpfiles.d