--- mcore-src/trunk/mcore-tools/src/Makefile	2014/01/11 00:01:45	2232
+++ mcore-src/trunk/mcore-tools/src/Makefile	2014/01/13 14:04:28	2251
@@ -8,16 +8,10 @@
 
 ifeq ($(SYSTEMINIT),systemd)
 	CLIENT_CLASSES += systemd
-	SYSTEMDSYSTEMUNITDIR = $(shell $(PKGCONFIG) --variable=systemdsystemunitdir systemd)
-	SYSTEMDSYSTEMCONFDIR = $(shell $(PKGCONFIG) --variable=systemdsystemconfdir systemd)
-	RUNDIR = /run
-	FILES += mcored.service
+	SUBDIRS += systemd
 else
 	CLIENT_CLASSES += sysvinit
-	SYSVRCDDIR = $(SYSCONFDIR)/rc.d
-	SYSVINITDDIR = $(SYSRCDDIR)/init.d
-	RUNDIR = $(LOCALSTATEDIR)/run
-	FILES += mcored.rc
+	SUBDIRS += sysvinit
 endif
 
 xinfo_CFLAGS = -lX11
@@ -27,29 +21,25 @@
 
 all: $(SUBDIRS) $(PROGS) $(SCRIPTS) $(FILES)
 
-install: $(INSTALLDIRS) install-client-services-$(SYSTEMINIT) all
+install: $(INSTALLDIRS) install-client all
+
+install-common: all
 	$(INSTALL) -d $(DESTDIR)/$(BINDIR)
-	$(INSTALL) -d $(DESTDIR)/$(SBINDIR)
 	$(INSTALL) -d $(DESTDIR)/$(MCORE_LIBDIR)
-	$(INSTALL) -m0755 xinfo $(DESTDIR)/$(BINDIR)
 	$(INSTALL) -m0755 mcorepasswd $(DESTDIR)/$(MCORE_LIBDIR)
 	$(INSTALL) -m0755 generate-certificate $(DESTDIR)/$(MCORE_LIBDIR)
-	$(INSTALL) -m0755 mcored $(DESTDIR)/$(MCORE_LIBDIR)
 	$(LN) $(MCORE_LIBDIR)/mcorepasswd $(DESTDIR)/$(BINDIR)/mcorepasswd
 	$(LN) $(MCORE_LIBDIR)/mcore-generate-certificate $(DESTDIR)/$(BINDIR)/mcore-generate-certificate
-	$(LN) $(MCORE_LIBDIR)/mcored $(DESTDIR)/$(SBINDIR)/mcored
-
-install-client-services-sysvinit:
-	$(INSTALL) -d $(DESTDIR)/$(CONFDDIR)
-	$(INSTALL) -d $(DESTDIR)/$(SYSVINITDDIR)
-	$(INSTALL) -m0644 mcored.confd $(DESTDIR)/$(CONFDDIR)/mcored
-	$(INSTALL) -m0755 mcored.rc $(DESTDIR)/$(SYSVINITDDIR)/mcored
 
-install-client-services-systemd:
+install-client: install-common install-$(SYSTEMINIT) all
 	$(INSTALL) -d $(DESTDIR)/$(CONFDDIR)
-	$(INSTALL) -d $(DESTDIR)/$(SYSTEMDSYSTEMUNITDIR)
+	$(INSTALL) -d $(DESTDIR)/$(BINDIR)
+	$(INSTALL) -d $(DESTDIR)/$(SBINDIR)
+	$(INSTALL) -d $(DESTDIR)/$(MCORE_LIBDIR)
 	$(INSTALL) -m0644 mcored.confd $(DESTDIR)/$(CONFDDIR)/mcored
-	$(INSTALL) -m0644 mcored.service $(DESTDIR)/$(SYSTEMDSYSTEMUNITDIR)
+	$(INSTALL) -m0755 xinfo $(DESTDIR)/$(BINDIR)
+	$(INSTALL) -m0755 mcored $(DESTDIR)/$(MCORE_LIBDIR)
+	$(LN) $(MCORE_LIBDIR)/mcored $(DESTDIR)/$(SBINDIR)/mcored
 
 clean: $(CLEANDIRS)
 	rm -f $(PROGS)
@@ -69,4 +59,6 @@
 .PHONY: $(SUBDIRS)
 .PHONY: $(INSTALLDIRS)
 .PHONY: $(CLEANDIRS)
+.PHONY: install-common
+.PHONY: install-client
 .PHONY: all install clean