From 3d122c36bfda9ab6dbed9cefe1a77f23f9b81cc3 Mon Sep 17 00:00:00 2001
From: Mike Hibler <mike@flux.utah.edu>
Date: Mon, 9 May 2005 18:41:53 +0000
Subject: [PATCH] Make DESTDIR work for Linux

---
 tmcd/linux/GNUmakefile.in  | 1 -
 tmcd/linux9/GNUmakefile.in | 7 +++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/tmcd/linux/GNUmakefile.in b/tmcd/linux/GNUmakefile.in
index 5e0383925b..5ecdaf8d15 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 550d0678c3..f4a854dd68 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
-- 
GitLab