Commit ce4dc409 authored by Leigh Stoller's avatar Leigh Stoller

Checkpoint; switch all the "install" targets to "boss-install" to

avoid confusion and bad things happening when someome does the wrong
kind of install. Its happened.
parent f412dcea
......@@ -24,6 +24,7 @@ SUBDIRS += event tools os sensors
ifeq ($(WITH_EMULAB),1)
all: all-subdirs
install:all boss-install-subdirs
else
all: client-subdirs
endif
......
......@@ -10,12 +10,13 @@ SUBDIR = $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
include $(OBJDIR)/Makeconf
SUBDIRS = program-agent link-agent
SUBDIRS = program-agent link-agent tbgen
all: all-subdirs
include $(TESTBED_SRCDIR)/GNUmakerules
boss-install: boss-install-subdirs
client: client-subdirs
client-install: client client-install-subdirs
control-install: control-install-subdirs
......
......@@ -52,7 +52,7 @@ link-agent-debug: link-agent.o
$(PROGRAMS): ${OBJDIR}/lib/event/libevent.a ${OBJDIR}/lib/event/event.h
install:
boss-install:
client: $(PROGRAMS)
client-install: client
......
......@@ -55,7 +55,7 @@ program-agent-debug: program-agent.o version.o
$(PROGRAMS): ${OBJDIR}/lib/event/libevent.a ${OBJDIR}/lib/event/event.h
install: $(INSTALL_DIR)/opsdir/sbin/program-agent
boss-install: $(INSTALL_DIR)/opsdir/sbin/program-agent
-mkdir -p $(INSTALL_DIR)/opsdir/man/man8
$(INSTALL) -m 0644 $(SRCDIR)/program-agent.8 \
$(INSTALL_DIR)/opsdir/man/man8/program-agent.8
......
......@@ -67,7 +67,7 @@ tevc-debug: tevc.o $(LIBTBDIR)/log.o $(LIBTBDIR)/tbdefs.o \
$(CC) $(LDFLAGS) -o $@ tevc.o $(LIBTBDIR)/log.o \
$(LIBTBDIR)/tbdefs.o $(LIBS)
install: $(INSTALL_BINDIR)/tevc \
boss-install: $(INSTALL_BINDIR)/tevc \
$(INSTALL_DIR)/opsdir/bin/tevc
control-install: all $(INSTALL_BINDIR)/tevc
......
......@@ -19,7 +19,7 @@ all: all-subdirs
include $(TESTBED_SRCDIR)/GNUmakerules
install:
boss-install:
-mkdir -p $(INSTALL_DIR)/opsdir/man/man1
$(INSTALL) -m 644 $(SRCDIR)/install-tarfile.1 \
$(INSTALL_DIR)/opsdir/man/man1/install-tarfile.1
......
......@@ -29,6 +29,7 @@ dijkstra-debug: Compressor.o TreeCompressor.o dijkstra.o \
NoneCompressor.o VoteIpTree.o SingleSource.o \
OptimalIpTree.o bitmath.o $(LIBS) -o $@
boss-install:
client: all
client-install: client
$(INSTALL_PROGRAM) dijkstra$(EXE) $(DESTDIR)$(CLIENT_BINDIR)/dijkstra$(EXE)
......
......@@ -22,7 +22,7 @@ genhostsfile-debug: genhostsfile.o
wgraph.o: wgraph.cc wgraph.h
install: $(INSTALL_LIBEXECDIR)/genhostsfile
boss-install: $(INSTALL_LIBEXECDIR)/genhostsfile
client: genhostsfile
client-install: client
......
......@@ -31,7 +31,7 @@ emulab-sync-debug: emulab-sync.o version.o decls.h
version.c: emulab-syncd.c
echo >$@ "char build_info[] = \"Built `date +%d-%b-%Y` by `id -nu`@`hostname | sed 's/\..*//'`:`pwd`\";"
install:
boss-install:
-mkdir -p $(INSTALL_DIR)/opsdir/man/man1
$(INSTALL) -m 644 $(SRCDIR)/emulab-syncd.1 \
$(INSTALL_DIR)/opsdir/man/man1/emulab-syncd.1
......
......@@ -19,6 +19,7 @@ all: all-subdirs
include $(TESTBED_SRCDIR)/GNUmakerules
boss-install: all boss-install-subdirs
client: client-subdirs
client-install: client client-install-subdirs
control-install: control-install-subdirs
......
......@@ -46,7 +46,8 @@ version.c: canaryd.c childProcess.h childProcess.c networkInterface.h networkInt
client: canaryd
install: $(addprefix $(INSTALL_SBINDIR)/, $(SBIN_SCRIPTS) alertlistener) feedbacklogs
boss-install: $(addprefix $(INSTALL_SBINDIR)/, $(SBIN_SCRIPTS) alertlistener) \
feedbacklogs
$(INSTALL_PROGRAM) feedbacklogs $(INSTALL_DIR)/opsdir/sbin/feedbacklogs
client-install: client
......
......@@ -62,7 +62,7 @@ version.c: slothd.c slothd.h sdcollectd.c sdcollectd.h $(WINCLIENTSRC)
client: slothd $(WINCLIENT)
install: $(addprefix $(INSTALL_SBINDIR)/, $(SBIN_SCRIPTS) sdcollectd) webfeedback
boss-install: $(addprefix $(INSTALL_SBINDIR)/, $(SBIN_SCRIPTS) sdcollectd) webfeedback
$(INSTALL_PROGRAM) $(SRCDIR)/digest-slothd $(INSTALL_LIBEXECDIR)
$(INSTALL_PROGRAM) $(SRCDIR)/digest-slothd $(INSTALL_DIR)/opsdir/sbin/digest-slothd
$(INSTALL_PROGRAM) webfeedback $(INSTALL_LIBEXECDIR)
......
......@@ -16,6 +16,7 @@ all: all-subdirs
include $(TESTBED_SRCDIR)/GNUmakerules
boss-install: all boss-install-subdirs
client: client-subdirs
client-install: client client-install-subdirs
control-install: control-install-subdirs
......
......@@ -113,5 +113,7 @@ pcapper-noevents.o: pcapper.c
client: pcapper
boss-install:
client-install: client
$(INSTALL_PROGRAM) -s pcapper $(DESTDIR)$(CLIENT_BINDIR)/pcapper
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