--- mcore-src/trunk/mcore-tools/daemon/client/mcored.in	2014/01/10 08:52:36	2125
+++ mcore-src/trunk/mcore-tools/src/mcored.in	2014/01/10 14:53:26	2203
@@ -1,25 +1,26 @@
 #!/bin/bash
 
-MCLIBDIR="/usr/lib/mcored"
+MCORE_LIBDIR="@@MCORE_LIBDIR@@"
 
 # respect system env (proxy settings etc)
-if [ -e /etc/profile ]
+if [ -e @@SYSCONFDIR@@/profile ]
 then
-	source /etc/profile
+	source @@SYSCONFDIR@@/profile
 fi
 
 # globals
-source ${MCLIBDIR}/include/daemon.global.class
-source ${MCLIBDIR}/include/sessionauth.global.class
-#source ${MCLIBDIR}/include/mysqlfunctions.global.class
-source ${MCLIBDIR}/include/hwdetection.global.class
+source ${MCORE_LIBDIR}/include/common.global.class
+source ${MCORE_LIBDIR}/include/daemon.global.class
+source ${MCORE_LIBDIR}/include/sessionauth.global.class
+#source ${MCORE_LIBDIR}/include/mysqlfunctions.global.class
+source ${MCORE_LIBDIR}/include/hwdetection.global.class
 
 # load client classes plugins
 load_client_classes
 
 # config settings
-source /etc/mcore/config.rc
-#source /etc/mcore/serial
+source @@SYSCONFDIR@@/mcore/config.rc
+#source @@SYSCONFDIR@@/mcore/serial
 
 # import_hardware_resource()
 # {