From: Ian Campbell <ian.campbell@citrix.com>
Date: Mon, 21 Mar 2011 17:46:28 +0000 (+0000)
Subject: tools: vtpm: Use $(BINDIR) rather than a privately defined variable
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0c42c5bdf53d66c5e8445f12a9d847e64fee5576;p=xen.git

tools: vtpm: Use $(BINDIR) rather than a privately defined variable

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---

diff --git a/tools/vtpm/Rules.mk b/tools/vtpm/Rules.mk
index c6a7487fbf..0dc225f64b 100644
--- a/tools/vtpm/Rules.mk
+++ b/tools/vtpm/Rules.mk
@@ -5,9 +5,6 @@ include $(XEN_ROOT)/tools/Rules.mk
 # Tool definitions
 #
 
-# Xen tools installation directory
-TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin
-
 # General compiler flags
 CFLAGS   = -Werror -g3 -I.
 
diff --git a/tools/vtpm_manager/Rules.mk b/tools/vtpm_manager/Rules.mk
index 461e13bf28..3830569256 100644
--- a/tools/vtpm_manager/Rules.mk
+++ b/tools/vtpm_manager/Rules.mk
@@ -5,9 +5,6 @@ include $(XEN_ROOT)/tools/Rules.mk
 # Tool definitions
 #
 
-# Xen tools installation directory
-TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin
-
 # General compiler flags
 CFLAGS	= -Werror -g3 -I.
 
diff --git a/tools/vtpm_manager/manager/Makefile b/tools/vtpm_manager/manager/Makefile
index 82da1068f8..8c572b78e0 100644
--- a/tools/vtpm_manager/manager/Makefile
+++ b/tools/vtpm_manager/manager/Makefile
@@ -17,7 +17,7 @@ install: build
 	if [ ! -d "$(DESTDIR)/var/vtpm/socks" ]; \
 		then mkdir -p $(DESTDIR)/var/vtpm/socks; \
 	fi
-	$(INSTALL_PROG) $(BIN) $(TOOLS_INSTALL_DIR)
+	$(INSTALL_PROG) $(BIN) $(BINDIR)
 
 .PHONY: clean
 clean:
diff --git a/tools/vtpm_manager/migration/Makefile b/tools/vtpm_manager/migration/Makefile
index cc6aee8f10..7f3f6bb0bb 100644
--- a/tools/vtpm_manager/migration/Makefile
+++ b/tools/vtpm_manager/migration/Makefile
@@ -20,8 +20,8 @@ build: $(BIND) $(BINC)
 
 .PHONY: install
 install: build
-	$(INSTALL_PROG) $(BIND) $(TOOLS_INSTALL_DIR)
-	$(INSTALL_PROG) $(BINC) $(TOOLS_INSTALL_DIR)
+	$(INSTALL_PROG) $(BIND) $(BINDIR)
+	$(INSTALL_PROG) $(BINC) $(BINDIR)
 
 .PHONY: clean
 clean: