Commit 96d85647 authored by Leigh Stoller's avatar Leigh Stoller

A set of toplevel makefile cleanups. No big deal.

parent ae3f999c
......@@ -4,15 +4,15 @@
$(INSTALL_BINDIR)/%: %
@echo "Installing $<"
-mkdir -p $(INSTALL_BINDIR)
$(INSTALL) $< $@
$(INSTALL_PROGRAM) $< $@
$(INSTALL_BINDIR)/%: %.tcl
@echo "Installing $<"
-mkdir -p $(INSTALL_BINDIR)
$(INSTALL) $< $@
$(INSTALL_PROGRAM) $< $@
$(INSTALL_LIBDIR)/%: %
@echo "Installing $<"
-mkdir -p $(INSTALL_LIBDIR)
$(INSTALL) $< $@
$(INSTALL_PROGRAM) $< $@
......@@ -5,9 +5,10 @@ prefix = /usr/testbed
exec_prefix = ${prefix}
INSTALL = /usr/bin/install -c
INSTALL_PROGRAM = ${INSTALL}
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL} -m 755
INSTALL_DATA = ${INSTALL} -m 444
INSTALL_DIR = $(exec_prefix)
INSTALL_BINDIR = $(exec_prefix)/bin
INSTALL_LIBDIR = $(exec_prefix)/lib
INSTALL_WWWDIR = $(exec_prefix)/www
......@@ -9,22 +9,6 @@ post-install:
@$(MAKE) -C tbsetup post-install
@$(MAKE) -C security post-install
install-ifyoudare: all
# XXXThese don't work anymore
#install -c os/gethostkey.tcl /usr/testbed/bin/gethostkey
#install -c os/hostkey.tcl /usr/testbed/bin/hostkey
#install -c os/instimage.exp /usr/testbed/bin/instimage
#install -c os/key7 /usr/testbed/bin
#install -c os/key8 /usr/testbed/bin
#install -c os/oslist.tcl /usr/testbed/bin/oslist
#install -c os/osnode2db.tcl /usr/testbed/bin/osnode2db
#install -c os/osnodestatus.tcl /usr/testbed/bin/osnodestatus
#install -c os/ossane.tcl /usr/testbed/bin/ossane
#install -c os/osset.tcl /usr/testbed/bin/osset
#install -c os/osstatus.tcl /usr/testbed/bin/osstatus
#install -c os/setupmachine.sh /usr/testbed/bin/setupmachine
#install -c os/imagezip/imagezip /usr/testbed/bin/imagezip
# How to recursively descend into subdirectories to make general
# targets such as `all'.
%.MAKE:
......
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