Add a control-install target for the auto-nice deamon (AND).

GNUmakefile.in

@@ -78,6 +78,7 @@ ops-install:
 ifeq ($(EVENTSYS),1)
 	@$(MAKE) -C event control-install
 endif
+	@$(MAKE) -C sensors control-install
 	@$(MAKE) -C xmlrpc control-install
 	@$(MAKE) -C tmcd control-install
 

sensors/GNUmakefile.in

@@ -29,7 +29,7 @@ endif
 ## `ACTIONS' is the set of actions that may be taken on a subdirectory or on
 ## the current directory.  These become phony targets.
 ##
-ACTIONS = all install client client-install clean distclean
+ACTIONS = all install client client-install control-install clean distclean
 
 ## `TARGETS' is the set of all `<subdir>.<action>' targets.
 ##

sensors/and/GNUmakefile.in

 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2004 University of Utah and the Flux Group.
+# Copyright (c) 2004, 2005 University of Utah and the Flux Group.
 # All rights reserved.
 #
 # This is the Emulab specific makefile.
@@ -183,6 +183,33 @@ endif
 	$(INSTALL) -m 0644 and.conf.5 $(DESTDIR)$(INSTALL_MAN)/man5
 	$(INSTALL) -m 0644 and.priorities.5 $(DESTDIR)$(INSTALL_MAN)/man5
 
+control-install: all
+	strip and
+#-mkdir $(PREFIX)
+	-mkdir -p $(INSTALL_DIR)/sbin
+	-mkdir -p $(INSTALL_DIR)/etc
+	-mkdir -p $(INSTALL_DIR)/etc/rc.d
+	-mkdir -p $(INSTALL_DIR)/man/man5
+	-mkdir -p $(INSTALL_DIR)/man/man8
+	$(INSTALL) -m 0755 and $(INSTALL_DIR)/sbin/and
+	$(INSTALL) -m 0644 and-emulab.conf $(INSTALL_DIR)/etc/and.conf
+	$(INSTALL) -m 0644 $(SRCDIR)/and-emulab.priorities \
+		$(INSTALL_DIR)/etc/and.priorities
+ifneq (${INITSCRIPT},)
+ifneq (${INSTALL_INITD},)
+	@echo "Installing SysV script in $(INSTALL_DIR)/etc/rc.d"
+	$(INSTALL) -m 0755 $(INITSCRIPT) $(INSTALL_DIR)/etc/rc.d/and
+else
+	@echo "Installing SysV script in $(INSTALL_DIR)/sbin"
+	$(INSTALL) -m 0755 $(INITSCRIPT) $(INSTALL_DIR)/sbin
+	@echo "Installing SysV init.d finder in $(INSTALL_DIR)/sbin"
+	$(INSTALL) -m 0755 and-find-init.d $(INSTALL_DIR)/sbin
+endif
+endif
+	$(INSTALL) -m 0644 and.8 $(INSTALL_DIR)/man/man8
+	$(INSTALL) -m 0644 and.conf.5 $(INSTALL_DIR)/man/man5
+	$(INSTALL) -m 0644 and.priorities.5 $(INSTALL_DIR)/man/man5
+
 simpleinstall: and and.init
 	strip and
 	mkdir -p $(DESTDIR)$(INSTALL_SBIN) $(DESTDIR)$(INSTALL_ETC)

sensors/canaryd/GNUmakefile.in

@@ -52,6 +52,8 @@ install: $(addprefix $(INSTALL_SBINDIR)/, $(SBIN_SCRIPTS) alertlistener) feedbac
 client-install: client
 	$(INSTALL_PROGRAM) -s canaryd$(EXE) $(DESTDIR)$(CLIENT_BINDIR)$(EXE)
 
+control-install:
+
 clean:
 	rm -f *.o $(CDPROGS) *~ core *.core version.c
 

sensors/slothd/GNUmakefile.in

@@ -51,5 +51,7 @@ install: $(addprefix $(INSTALL_SBINDIR)/, $(SBIN_SCRIPTS) sdcollectd) webfeedbac
 client-install: client
 	$(INSTALL_PROGRAM) slothd$(EXE) $(DESTDIR)$(CLIENT_BINDIR)$(EXE)
 
+control-install:
+
 clean:
 	rm -f *.o $(SDPROGS) *~ core *.core version.c