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 c6a7487fbf9ad9634b599a5ab212675c769cca7a..0dc225f64bac316b8140dc1e8a5a650c27f16e8c 100644 (file)
--- 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 461e13bf2849623d821b7e73f72c8c6d5930077d..383056925672628605676d73324781edbb7ef253 100644 (file)
--- 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 82da1068f888895094217f62887ad22246ecfcf7..8c572b78e01b418f66b6cdfe1722e3be1ee61787 100644 (file)
--- 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 cc6aee8f10ae4d33e48653aec23ef3b22f2773c9..7f3f6bb0bbae281cc39a52e8200b3c6f6ea6cf82 100644 (file)
--- 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: