Commit 8f313e23 authored by Mike Hibler's avatar Mike Hibler

A few more changes related to getting DESTDIR working

parent e99c3383
......@@ -44,10 +44,10 @@ remote-install: path-install remote-script-install
control-install: path-install control-script-install
other-install:
(cd ../../os; $(MAKE) client-install)
(cd ../../event; $(MAKE) client-install)
(cd ../../sensors/slothd; $(MAKE) client-install)
(cd ../../tools; $(MAKE) client-install)
(cd ../../os; $(MAKE) DESTDIR=$(DESTDIR) client-install)
(cd ../../event; $(MAKE) DESTDIR=$(DESTDIR) client-install)
(cd ../../sensors/slothd; $(MAKE) DESTDIR=$(DESTDIR) client-install)
(cd ../../tools; $(MAKE) DESTDIR=$(DESTDIR) client-install)
dir-install:
$(INSTALL) -m 755 -o root -g wheel -d $(ETCDIR)
......@@ -81,7 +81,7 @@ common-script-install: dir-install
$(INSTALL) -m 755 $(SRCDIR)/bootsubnodes $(BINDIR)/bootsubnodes
$(INSTALL) -m 755 $(SRCDIR)/bootvnodes $(BINDIR)/bootvnodes
$(INSTALL) -m 755 $(SRCDIR)/startcmddone $(BINDIR)/startcmddone
(cd config; $(MAKE) script-install)
(cd config; $(MAKE) DESTDIR=$(DESTDIR) script-install)
symlinks: dir-install
rm -f $(TBBINDIR)/tevc$(EXE)
......
......@@ -70,7 +70,7 @@ dir-install:
ln -s emulab $(DESTDIR)/usr/local/etc/testbed
common-install: dir-install
(cd ../common; $(MAKE) local-install)
(cd ../common; $(MAKE) DESTDIR=$(DESTDIR) local-install)
sup-install: dir-install supfile
$(INSTALL) -m 755 ./supfile $(ETCDIR)/supfile
......
......@@ -77,4 +77,4 @@ pcapper-noevents.o: pcapper.c
client: pcapper
client-install: client
$(INSTALL_PROGRAM) pcapper $(DESTDIR)$(CLIENT_BINDIR)/pcapper
$(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