# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1300718506 0
# Node ID c0d62ae9fdb23008269dce714919fc64b511efe5
# Parent fca900cf6e12e1347dc27552140591df20ff5af5
tools: vtpm: Use $(BINDIR) rather than a privately defined variable
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
diff -r fca900cf6e12 -r c0d62ae9fdb2 tools/vtpm/Rules.mk
--- a/tools/vtpm/Rules.mk Mon Mar 21 14:41:46 2011 +0000
+++ b/tools/vtpm/Rules.mk Mon Mar 21 14:41:46 2011 +0000
@@ -4,9 +4,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 -r fca900cf6e12 -r c0d62ae9fdb2 tools/vtpm_manager/Rules.mk
--- a/tools/vtpm_manager/Rules.mk Mon Mar 21 14:41:46 2011 +0000
+++ b/tools/vtpm_manager/Rules.mk Mon Mar 21 14:41:46 2011 +0000
@@ -4,9 +4,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 -r fca900cf6e12 -r c0d62ae9fdb2 tools/vtpm_manager/manager/Makefile
--- a/tools/vtpm_manager/manager/Makefile Mon Mar 21 14:41:46 2011 +0000
+++ b/tools/vtpm_manager/manager/Makefile Mon Mar 21 14:41:46 2011 +0000
@@ -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 -r fca900cf6e12 -r c0d62ae9fdb2 tools/vtpm_manager/migration/Makefile
--- a/tools/vtpm_manager/migration/Makefile Mon Mar 21 14:41:46 2011 +0000
+++ b/tools/vtpm_manager/migration/Makefile Mon Mar 21 14:41:46 2011 +0000
@@ -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:
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel