diff --git a/tmcd/linux/GNUmakefile.in b/tmcd/linux/GNUmakefile.in index 5e0383925be52e83141118bbc99050d34111c657..5ecdaf8d1588866ed82cae11c066dee1a57b70c8 100644 --- a/tmcd/linux/GNUmakefile.in +++ b/tmcd/linux/GNUmakefile.in @@ -28,7 +28,6 @@ all: supfile $(SCRIPTS) include $(TESTBED_SRCDIR)/GNUmakerules -DESTDIR = SYSETCDIR ?= $(DESTDIR)/etc ETCDIR ?= $(DESTDIR)$(CLIENT_ETCDIR) BINDIR ?= $(DESTDIR)$(CLIENT_BINDIR) diff --git a/tmcd/linux9/GNUmakefile.in b/tmcd/linux9/GNUmakefile.in index 550d0678c3554bbd4a3f521875b087d59f4fd5e6..f4a854dd68f5d58508b2fab95c65ae3d77fa6e2b 100644 --- a/tmcd/linux9/GNUmakefile.in +++ b/tmcd/linux9/GNUmakefile.in @@ -1,6 +1,6 @@ # # EMULAB-COPYRIGHT -# Copyright (c) 2000-2004 University of Utah and the Flux Group. +# Copyright (c) 2000-2005 University of Utah and the Flux Group. # All rights reserved. # @@ -28,7 +28,6 @@ all: supfile ifcfgs include $(TESTBED_SRCDIR)/GNUmakerules -DESTDIR = SYSETCDIR = $(DESTDIR)/etc ETCDIR = $(DESTDIR)$(CLIENT_ETCDIR) BINDIR = $(DESTDIR)$(CLIENT_BINDIR) @@ -46,10 +45,10 @@ simple-install: common-install script-install bin-install dir-install: baselinux-install: dir-install - (cd ../linux; $(MAKE) client-install) + (cd ../linux; $(MAKE) DESTDIR=$(DESTDIR) client-install) 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