--- mcore-src/trunk/mcore-tools/Makefile	2013/05/08 11:20:11	2052
+++ mcore-src/trunk/mcore-tools/Makefile	2013/05/08 11:30:59	2053
@@ -14,14 +14,17 @@
 INSTALL = install
 LN = ln -snf
 SED = sed -i
+PKGCONFIG = pkg-config
+
+SYSTEMDUNITDIR = $(shell pkg-config --variable=systemdsystemunitdir systemd)
 
 GLOBAL_CLASSES = daemon hwdetection sessionauth
 CLIENT_CLASSES = boot citrix fluxbox graphic hardware input mage network printing system vnc
 
+install: install-client-daemon install-client-services-sysvinit install-client-services-systemd
+
 install-client-daemon:
 	$(INSTALL) -d $(DESTDIR)/$(ETCDIR)/mcore
-	$(INSTALL) -d $(DESTDIR)/$(ETCDIR)/conf.d
-	$(INSTALL) -d $(DESTDIR)/$(RCINITDIR)
 	$(INSTALL) -d $(DESTDIR)/$(MCLIBDIR)/include
 	$(INSTALL) -d $(DESTDIR)/$(BINDIR)
 	$(INSTALL) -d $(DESTDIR)/$(SBINDIR)
@@ -30,8 +33,6 @@
 	$(INSTALL) -m0700 -d $(DESTDIR)/$(CERTDIR)/private
 
 	$(INSTALL) -m0644 conf/config.rc $(DESTDIR)/$(ETCDIR)/mcore/
-	$(INSTALL) -m0644 daemon/client/mcored.confd $(DESTDIR)/$(ETCDIR)/conf.d/mcored
-	$(INSTALL) -m0755 daemon/client/mcored.rc $(DESTDIR)/$(RCINITDIR)/mcored
 	$(INSTALL) -m0644 daemon/certs/mcored.pem $(DESTDIR)/$(CERTDIR)/certs
 	$(INSTALL) -m0400 daemon/certs/mcored.key $(DESTDIR)/$(CERTDIR)/private
 
@@ -59,3 +60,14 @@
 	done
 	$(INSTALL) -m0644 VERSION $(DESTDIR)/${MCLIBDIR}/VERSION
 
+install-client-services-sysvinit:
+	$(INSTALL) -d $(DESTDIR)/$(ETCDIR)/conf.d
+	$(INSTALL) -d $(DESTDIR)/$(RCINITDIR)
+	$(INSTALL) -m0644 daemon/client/mcored.confd $(DESTDIR)/$(ETCDIR)/conf.d/mcored
+	$(INSTALL) -m0755 daemon/client/mcored.rc $(DESTDIR)/$(RCINITDIR)/mcored
+
+install-client-services-systemd:
+	$(INSTALL) -d $(DESTDIR)/$(ETCDIR)/conf.d
+	$(INSTALL) -d $(DESTDIR)/$(SYSTEMDUNITDIR)
+	$(INSTALL) -m0644 daemon/client/mcored.confd $(DESTDIR)/$(ETCDIR)/conf.d/mcored
+	$(INSTALL) -m0644 systemd/mcored.service $(DESTDIR)/$(SYSTEMDUNITDIR)