--- mcore-src/trunk/mcore-tools/Makefile.inc	2014/01/11 00:42:08	2242
+++ mcore-src/trunk/mcore-tools/Makefile.inc	2014/01/13 14:12:34	2252
@@ -11,13 +11,7 @@
 CONFDDIR = $(SYSCONFDIR)/conf.d
 SSLDIR = ${SYSCONFDIR}/ssl
 PIXMAPSDIR = $(DATADIR)/pixmaps
-DRACUTCONFDIR = ${SYSCONFDIR}/dracut.conf.d
-DRACUTMODULESDIR = ${LIBDIR}/dracut/modules.d
-SYSTEMDSYSTEMUNITDIR = 
-SYSTEMDSYSTEMCONFDIR = 
-SYSVRCDDIR = 
-SYSVINITDDIR = 
-CLIENT_CLASSES = 
+CLIENT_CLASSES =
 
 MCORE_LIBDIR = $(LIBDIR)/mcored
 MCORE_CHROOTDIR = $(LOCALSTATEDIR)/lib/mcored
@@ -39,19 +33,17 @@
 SED = sed
 PKGCONFIG = pkg-config
 
-SCRIPT_SED_COMMAND = \
-	$(SED) \
+SCRIPT_SED_LINES = \
 		-e "s:@@SYSCONFDIR@@:$(SYSCONFDIR):g" \
+		-e "s:@@BINDIR@@:$(BINDIR):g" \
 		-e "s:@@SBINDIR@@:$(SBINDIR):g" \
+		-e "s:@@LIBDIR@@:$(LIBDIR):g" \
+		-e "s:@@DATADIR@@:$(DATADIR):g" \
 		-e "s:@@LOCALSTATEDIR@@:$(LOCALSTATEDIR):g" \
 		-e "s:@@CONFDDIR@@:$(CONFDDIR):g" \
 		-e "s:@@RUNDIR@@:$(RUNDIR):g" \
 		-e "s:@@PIXMAPSDIR@@:$(PIXMAPSDIR):g" \
 		-e "s:@@SSLDIR@@:$(SSLDIR):g" \
-		-e "s:@@SYSVINITDDIR@@:$(SYSVINITDDIR):g" \
-		-e "s:@@SYSVRCDDIR@@:$(SYSVRCDDIR):g" \
-		-e "s:@@SYSTEMDSYSTEMUNITDIR@@:$(SYSTEMDSYSTEMUNITDIR):g" \
-		-e "s:@@SYSTEMDSYSTEMCONFDIR@@:$(SYSTEMDSYSTEMCONFDIR):g" \
 		-e "s:@@MCORE_LIBDIR@@:$(MCORE_LIBDIR):g" \
 		-e "s:@@MCORE_CHROOTDIR@@:$(MCORE_CHROOTDIR):g" \
 		-e "s:@@MCORE_DISTRIBUTION@@:$(MCORE_DISTRIBUTION):g" \
@@ -60,7 +52,11 @@
 		-e "s:@@MCORE_CONTROL_SERVER@@:$(MCORE_CONTROL_SERVER):g" \
 		-e "s:@@MCORE_UNPRIV_USER@@:$(MCORE_UNPRIV_USER):g" \
 		-e "s:@@MCORE_UNPRIV_GROUP@@:$(MCORE_UNPRIV_GROUP):g" \
-		-e "s:@@MCORE_UNPRIV_HOME@@:$(MCORE_UNPRIV_HOME):g" \
+		-e "s:@@MCORE_UNPRIV_HOME@@:$(MCORE_UNPRIV_HOME):g"
+
+SCRIPT_SED_COMMAND = \
+	$(SED) \
+		$(SCRIPT_SED_LINES) \
 		$< > $@
 
 SCRIPT_EXEC_CREATE_COMMAND = \