Commit c7b505d9 authored by Mike Hibler's avatar Mike Hibler

Make sure frisbee gets installed in the right place for everyone.

Finally just had to add a target for the mfs install since there
seemed to be no way to make CLIENT_BINDIR work for both /usr/local/bin
and /etc/testbed. Now Leigh and I can stop overwriting each others' commits.
parent 31f8ea31
......@@ -115,11 +115,11 @@ frisbee-mfs:
frisbee-mfs-install:
ifeq ($(SYSTEM),FreeBSD)
CLIENT_BINDIR=/etc/testbed $(MAKE) -e -C frisbee.redux client-install
CLIENT_BINDIR=/etc/testbed $(MAKE) -e -C frisbee.redux frisbee-mfs-install
CLIENT_BINDIR=/etc/testbed $(MAKE) -e -C growdisk client-install
CLIENT_BINDIR=/etc/testbed $(MAKE) -e -C zapdisk frisbee-mfs-install
else
CLIENT_BINDIR=/usr/local/bin $(MAKE) -e -C frisbee.redux client-install
$(MAKE) -C frisbee.redux client-install
$(MAKE) -C growdisk client-install
$(MAKE) -C zapdisk frisbee-mfs-install
rm -f $(CBINDIR)/frisbee $(CBINDIR)/frisupload
......
......@@ -24,9 +24,6 @@ SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
OBJDIR = @top_builddir@
SUBDIR = $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
ifndef CLIENT_BINDIR
CLIENT_BINDIR = /usr/local/bin
endif
DISTFILES = TODO client.c decls.h event.c event.h log.c log.h \
network.c queue.h server.c trace.c trace.h utils.c utils.h
......@@ -312,6 +309,10 @@ client-install: client
$(INSTALL_PROGRAM) frisbee $(DESTDIR)/usr/local/bin/frisbee
$(INSTALL_PROGRAM) frisupload $(DESTDIR)/usr/local/bin/frisupload
frisbee-mfs-install: client
$(INSTALL_PROGRAM) frisbee $(DESTDIR)$(CLIENT_BINDIR)/frisbee
$(INSTALL_PROGRAM) frisupload $(DESTDIR)$(CLIENT_BINDIR)/frisupload
clean:
/bin/rm -f *.o *.a *.debug
/bin/rm -f frisbee frisbeed mfrisbeed frisupload frisuploadd
......
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