aboutsummaryrefslogtreecommitdiffstats
path: root/tools/blktap
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2008-01-22 14:35:02 +0000
committerKeir Fraser <keir.fraser@citrix.com>2008-01-22 14:35:02 +0000
commit93e3de7b940428c3c66c6340c621a3b92c14cff6 (patch)
tree3fea73c58d2bb41e430636efcde7216fa84fd12a /tools/blktap
parent93a029ac74a0f497b020e03d066594ab0108bb9c (diff)
downloadxen-93e3de7b940428c3c66c6340c621a3b92c14cff6.tar.gz
xen-93e3de7b940428c3c66c6340c621a3b92c14cff6.tar.bz2
xen-93e3de7b940428c3c66c6340c621a3b92c14cff6.zip
Add SBINDIR. Use it always.
Signed-off-by: Bastian Blank <waldi@debian.org>
Diffstat (limited to 'tools/blktap')
-rw-r--r--tools/blktap/drivers/Makefile3
-rw-r--r--tools/blktap/lib/Makefile2
2 files changed, 1 insertions, 4 deletions
diff --git a/tools/blktap/drivers/Makefile b/tools/blktap/drivers/Makefile
index 8d2759fadc..d5c3f77e2d 100644
--- a/tools/blktap/drivers/Makefile
+++ b/tools/blktap/drivers/Makefile
@@ -5,7 +5,6 @@ INCLUDES += -I.. -I../lib
IBIN = blktapctrl tapdisk
QCOW_UTIL = img2qcow qcow2raw qcow-create
-INST_DIR = /usr/sbin
LIBAIO_DIR = ../../libaio/src
CFLAGS += -Werror
@@ -53,7 +52,7 @@ img2qcow qcow2raw qcow-create: %: $(BLK-OBJS-y)
$(CC) $(CFLAGS) -o $* $(BLK-OBJS-y) $*.c $(LDFLAGS) $(AIOLIBS) $(LIBS)
install: all
- $(INSTALL_PROG) $(IBIN) $(QCOW_UTIL) $(VHD_UTIL) $(DESTDIR)$(INST_DIR)
+ $(INSTALL_PROG) $(IBIN) $(QCOW_UTIL) $(VHD_UTIL) $(DESTDIR)$(SBINDIR)
clean:
rm -rf *.o *~ $(DEPS) xen TAGS $(IBIN) $(LIB) $(QCOW_UTIL) $(VHD_UTIL)
diff --git a/tools/blktap/lib/Makefile b/tools/blktap/lib/Makefile
index 844295f398..dee5b8112d 100644
--- a/tools/blktap/lib/Makefile
+++ b/tools/blktap/lib/Makefile
@@ -5,8 +5,6 @@ MAJOR = 3.0
MINOR = 0
SONAME = libblktap.so.$(MAJOR)
-BLKTAP_INSTALL_DIR = /usr/sbin
-
INCLUDES += -I. -I.. -I $(XEN_LIBXC) -I $(XEN_XENSTORE)
LIBS := -lz