Commit 471e3f81 authored by Leigh Stoller's avatar Leigh Stoller

Another small set of install changes for ops vs control node. I put in

simple autogen of the symlinks to plasticwrap on the control node, and
added control-install targets in several more directories.
parent 80744d0a
......@@ -13,7 +13,13 @@ SUBDIRS = lib assign discvr tbsetup db os security pxe tmcd www tip capture
all: all-subdirs
install: install-subdirs install-mkdirs
install:
@echo "Choose either ops-install (paper) or control-install (plastic)"
#
# For installation on ops node (okay, paper).
#
ops-install: install-subdirs install-mkdirs
@echo "DON'T FORGET TO RUN A POST-INSTALL AS ROOT"
post-install:
......@@ -26,6 +32,10 @@ post-install:
control-install:
@$(MAKE) -C tbsetup control-install
@$(MAKE) -C security control-install
@$(MAKE) -C tip control-install
@$(MAKE) -C os control-install
@$(MAKE) -C db control-install
@$(MAKE) -C tbsetup control-install
install-mkdirs:
-mkdir -p $(INSTALL_TOPDIR)/locks
......
......@@ -24,4 +24,13 @@ install: $(addprefix $(INSTALL_BINDIR)/, $(BIN_SCRIPTS)) \
$(addprefix $(INSTALL_SBINDIR)/, $(SBIN_SCRIPTS)) \
$(addprefix $(INSTALL_LIBEXECDIR)/, $(LIBEXEC_SCRIPTS))
#
# Control node installation (okay, plastic)
#
control-install:
cd /tmp/gg && \
list='$(BIN_SCRIPTS)'; for file in $$list; do \
ln -s plasticwrap $$file; \
done;
clean:
......@@ -18,7 +18,10 @@ imagezip:
@$(MAKE) -C imagezip all
install:
@$(MAKE) -C imagezip install
@$(MAKE) -C imagezip install
control-install:
@$(MAKE) -C imagezip install
clean: subdir-clean
......
......@@ -76,6 +76,10 @@ post-install:
# Control node installation (okay, plastic)
#
control-install: $(addprefix $(INSTALL_SBINDIR)/, console_setup.proxy)
cd $(INSTALL_BINDIR) && \
list='$(BIN_STUFF)'; for file in $$list; do \
ln -s plasticwrap $$file; \
done;
clean: subdir-clean
rm -f *.o core tbreport
......
......@@ -28,7 +28,13 @@ tip.static: $(OBJS)
$(OBJS): tipconf.h tip.h
install: all
-mkdir -p $(INSTALL_BINDIR)
$(INSTALL_PROGRAM) tip.static $(INSTALL_BINDIR)/tip
#
# Control node installation (okay, plastic)
#
control-install: install
clean:
rm -f $(OBJS) tip tip.static
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment