--- mcore-src/trunk/mcore-tools/src/Makefile	2014/01/16 13:34:29	2294
+++ mcore-src/trunk/mcore-tools/src/Makefile	2015/12/16 13:52:18	2698
@@ -3,7 +3,7 @@
 
 SUBDIRS = include modules
 FILES = mcored.confd
-SCRIPTS = generate-certificate mcored mcorepasswd
+SCRIPTS = generate-certificate mcored mcorepasswd mcore-controld mcore-register-client mcore-serial mcore-request-configuration mcore-controlserver
 PROGS = xinfo.o xinfo
 
 ifeq ($(SYSTEMINIT),systemd)
@@ -21,15 +21,15 @@
 
 all: $(SUBDIRS) $(PROGS) $(SCRIPTS) $(FILES)
 
-install: $(INSTALLDIRS) install-client all
+install: $(INSTALLDIRS) install-client install-control all
 
 install-common: all
 	$(INSTALL) -d $(DESTDIR)/$(BINDIR)
 	$(INSTALL) -d $(DESTDIR)/$(MCORE_LIBDIR)
 	$(INSTALL) -m0755 mcorepasswd $(DESTDIR)/$(MCORE_LIBDIR)
-	$(INSTALL) -m0755 generate-certificate $(DESTDIR)/$(MCORE_LIBDIR)
+	$(INSTALL) -m0755 generate-certificate $(DESTDIR)/$(MCORE_LIBDIR)/mcore-generate-certificate
 	$(LN) $(MCORE_LIBDIR)/mcorepasswd $(DESTDIR)/$(BINDIR)/mcorepasswd
-	$(LN) $(MCORE_LIBDIR)/generate-certificate $(DESTDIR)/$(BINDIR)/mcore-generate-certificate
+	$(LN) $(MCORE_LIBDIR)/mcore-generate-certificate $(DESTDIR)/$(BINDIR)/mcore-generate-certificate
 
 install-client: install-common install-$(SYSTEMINIT) all
 	$(INSTALL) -d $(DESTDIR)/$(CONFDDIR)
@@ -38,9 +38,22 @@
 	$(INSTALL) -d $(DESTDIR)/$(MCORE_LIBDIR)
 	$(INSTALL) -m0644 mcored.confd $(DESTDIR)/$(CONFDDIR)/mcored
 	$(INSTALL) -m0755 xinfo $(DESTDIR)/$(BINDIR)
+	$(INSTALL) -m0755 mcore-serial $(DESTDIR)/$(BINDIR)
+	$(INSTALL) -m0755 mcore-controlserver $(DESTDIR)/$(BINDIR)
+	$(INSTALL) -m0755 mcore-register-client $(DESTDIR)/$(BINDIR)
+	$(INSTALL) -m0755 mcore-request-configuration $(DESTDIR)/$(BINDIR)
 	$(INSTALL) -m0755 mcored $(DESTDIR)/$(MCORE_LIBDIR)
 	$(LN) $(MCORE_LIBDIR)/mcored $(DESTDIR)/$(SBINDIR)/mcored
 
+install-control: install-common install-$(SYSTEMINIT) all
+	$(INSTALL) -d $(DESTDIR)/$(CONFDDIR)
+	$(INSTALL) -d $(DESTDIR)/$(BINDIR)
+	$(INSTALL) -d $(DESTDIR)/$(SBINDIR)
+	$(INSTALL) -d $(DESTDIR)/$(MCORE_LIBDIR)
+	$(INSTALL) -m0644 mcored.confd $(DESTDIR)/$(CONFDDIR)/mcored
+	$(INSTALL) -m0755 mcore-controld $(DESTDIR)/$(MCORE_LIBDIR)
+	$(LN) $(MCORE_LIBDIR)/mcore-controld $(DESTDIR)/$(SBINDIR)/mcore-controld
+
 clean: $(CLEANDIRS)
 	rm -f $(PROGS)
 	rm -f $(SCRIPTS)
@@ -61,4 +74,5 @@
 .PHONY: $(CLEANDIRS)
 .PHONY: install-common
 .PHONY: install-client
+.PHONY: install-control
 .PHONY: all install clean