--- mcore-src/trunk/mcore-tools/src/systemd/Makefile	2015/09/03 14:18:57	2452
+++ mcore-src/trunk/mcore-tools/src/systemd/Makefile	2016/06/20 11:49:40	2797
@@ -4,8 +4,9 @@
 SYSTEMDSYSTEMUNITDIR = $(shell $(PKGCONFIG) --variable=systemdsystemunitdir systemd)
 SYSTEMDSYSTEMCONFDIR = $(shell $(PKGCONFIG) --variable=systemdsystemconfdir systemd)
 RUNDIR = /run
+FACTORYDIR = $(DATADIR)/factory
 
-FILES = mcored.service mcore-controld.service mcore-register-client.service mcored.tmpfilesd.conf
+FILES = mcored.service mcore-controld.service mcore-register-client.service mcored.tmpfilesd.conf mcore-request-configuration.service mcore-configd.tmpfilesd.conf mcore-user.tmpfilesd.conf factory-xinitrc
 
 SCRIPT_SED_LINES += \
 	-e "s:@@SYSTEMDSYSTEMUNITDIR@@:$(SYSTEMDSYSTEMUNITDIR):g" \
@@ -13,24 +14,40 @@
 
 all: $(FILES)
 
-install: install-client-services-systemd
+install: install-common install-client install-control all
+
+install-common: install-common-services-systemd
+
+install-client: install-client-services-systemd
+
+install-control: install-control-services-systemd
+
+install-common-services-systemd: all
+	$(INSTALL) -d $(DESTDIR)/$(SYSCONFDIR)/tmpfiles.d
+	$(INSTALL) -m0644 mcored.tmpfilesd.conf $(DESTDIR)/$(SYSCONFDIR)/tmpfiles.d/mcored.conf
+	$(INSTALL) -m0644 mcore-configd.tmpfilesd.conf $(DESTDIR)/$(SYSCONFDIR)/tmpfiles.d/mcore-configd.conf
 
 install-client-services-systemd: all
+	$(INSTALL) -d $(DESTDIR)/$(SYSCONFDIR)/tmpfiles.d
+	$(INSTALL) -m0644 mcore-user.tmpfilesd.conf $(DESTDIR)/$(SYSCONFDIR)/tmpfiles.d/mcore-user.conf
+	$(INSTALL) -d $(DESTDIR)/$(FACTORYDIR)/$(MCORE_UNPRIV_HOME)
+	$(INSTALL) -m0644 factory-xinitrc $(DESTDIR)/$(FACTORYDIR)/$(MCORE_UNPRIV_HOME)/.xinitrc
 	$(INSTALL) -d $(DESTDIR)/$(SYSTEMDSYSTEMUNITDIR)
 	$(INSTALL) -m0644 mcored.service $(DESTDIR)/$(SYSTEMDSYSTEMUNITDIR)
 	$(INSTALL) -m0644 mcore-register-client.service $(DESTDIR)/$(SYSTEMDSYSTEMUNITDIR)
-	$(INSTALL) -d $(DESTDIR)/$(SYSCONFDIR)/tmpfiles.d
-	$(INSTALL) -m0644 mcored.tmpfilesd.conf $(DESTDIR)/$(SYSCONFDIR)/tmpfiles.d/mcored.conf
+	$(INSTALL) -m0644 mcore-request-configuration.service $(DESTDIR)/$(SYSTEMDSYSTEMUNITDIR)
 
 install-control-services-systemd: all
 	$(INSTALL) -d $(DESTDIR)/$(SYSTEMDSYSTEMUNITDIR)
 	$(INSTALL) -m0644 mcore-controld.service $(DESTDIR)/$(SYSTEMDSYSTEMUNITDIR)
-	$(INSTALL) -d $(DESTDIR)/$(SYSCONFDIR)/tmpfiles.d
-	$(INSTALL) -m0644 mcored.tmpfilesd.conf $(DESTDIR)/$(SYSCONFDIR)/tmpfiles.d/mcored.conf
 
 clean:
 	rm -f $(FILES)
 
+.PHONY: install-common
+.PHONY: install-client
+.PHONY: install-control
+.PHONY: install-common-services-systemd
 .PHONY: install-client-services-systemd
 .PHONY: install-control-services-systemd
 .PHONY: all install clean