Add PRIVATE_BINDIR. Use it.

Signed-off-by: Bastian Blank <waldi@debian.org>

diff --git a/config/StdGNU.mk b/config/StdGNU.mk
index e1a8b6f6be5878c72ddd572fe8098fdd38980eb9..ed383cf25db2103465ff201d10be7c23f7af318a 100644 (file)
--- a/config/StdGNU.mk
+++ b/config/StdGNU.mk
@@ -27,6 +27,9 @@ MAN1DIR = $(MANDIR)/man1
 MAN8DIR = $(MANDIR)/man8
 SBINDIR = $(PREFIX)/sbin
 
+PRIVATE_PREFIX = $(LIBDIR)/xen
+PRIVATE_BINDIR = $(PRIVATE_PREFIX)/bin
+
 SOCKET_LIBS =
 CURSES_LIBS = -lncurses
 UTIL_LIBS = -lutil

diff --git a/config/SunOS.mk b/config/SunOS.mk
index 3992689f837c2016b6f75bd75b3d3e3c90c050f6..16163b682073440c1badaa31c733e492e2dc2bbc 100644 (file)
--- a/config/SunOS.mk
+++ b/config/SunOS.mk
@@ -28,6 +28,9 @@ MAN1DIR = $(MANDIR)/man1
 MAN8DIR = $(MANDIR)/man8
 SBINDIR = $(PREFIX)/sbin
 
+PRIVATE_PREFIX = $(LIBDIR)/xen
+PRIVATE_BINDIR = $(PRIVATE_PREFIX)/bin
+
 SunOS_LIBDIR = /usr/sfw/lib
 SunOS_LIBDIR_x86_64 = /usr/sfw/lib/amd64
 

diff --git a/tools/console/Makefile b/tools/console/Makefile
index 85c2ad85749c32d68fc7574b316e55833ec50add..1e60bd2ee039d844bd124d639fe37c892998b5f5 100644 (file)
--- a/tools/console/Makefile
+++ b/tools/console/Makefile
@@ -2,8 +2,6 @@
 XEN_ROOT=../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-CLIENT_INSTALL_DIR = $(LIBDIR)/xen/bin
-
 CFLAGS  += -Werror
 
 CFLAGS  += -I $(XEN_LIBXC)
@@ -32,5 +30,5 @@ xenconsole: $(patsubst %.c,%.o,$(wildcard client/*.c))
 install: $(BIN)
        $(INSTALL_DIR) $(DESTDIR)/$(SBINDIR)
        $(INSTALL_PROG) xenconsoled $(DESTDIR)/$(SBINDIR)
-       $(INSTALL_DIR) $(DESTDIR)/$(CLIENT_INSTALL_DIR)
-       $(INSTALL_PROG) xenconsole $(DESTDIR)/$(CLIENT_INSTALL_DIR)
+       $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
+       $(INSTALL_PROG) xenconsole $(DESTDIR)$(PRIVATE_BINDIR)

diff --git a/tools/debugger/xenitp/Makefile b/tools/debugger/xenitp/Makefile
index 43049de85fc83a2965a2bfd6ab9b9a55ec38cb01..3b1e61b435e6b6127202bf72216352b3ad511182 100644 (file)
--- a/tools/debugger/xenitp/Makefile
+++ b/tools/debugger/xenitp/Makefile
@@ -27,11 +27,11 @@ build: $(BIN) $(LIBBIN)
 .PHONY: install
 install: build
        $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
-       [ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/xen/bin
+       [ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
        $(INSTALL_DIR) $(DESTDIR)$(MAN1DIR)
        $(INSTALL_DIR) $(DESTDIR)$(MAN8DIR)
        $(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)$(BINDIR)
-       [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBDIR)/xen/bin
+       [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(PRIVATE_BINDIR)
        $(INSTALL_DATA) $(MAN1) $(DESTDIR)$(MAN1DIR)
        $(INSTALL_DATA) $(MAN8) $(DESTDIR)$(MAN8DIR)
 

diff --git a/tools/xcutils/Makefile b/tools/xcutils/Makefile
index 4c004750bf05b8a960e9c700510bcb08c9675863..b7714c1f386a69126583e0c12607399519756f24 100644 (file)
--- a/tools/xcutils/Makefile
+++ b/tools/xcutils/Makefile
@@ -11,8 +11,6 @@
 XEN_ROOT       = ../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-PROGRAMS_INSTALL_DIR = $(LIBDIR)/xen/bin
-
 INCLUDES += -I $(XEN_LIBXC) -I $(XEN_XENSTORE) -I$(XEN_INCLUDE)
 
 CFLAGS += -Werror
@@ -37,9 +35,8 @@ $(PROGRAMS): %: %.o
 
 .PHONY: install
 install: build
-       [ -d $(DESTDIR)$(PROGRAMS_INSTALL_DIR) ] || \
-               $(INSTALL_DIR) $(DESTDIR)$(PROGRAMS_INSTALL_DIR)
-       $(INSTALL_PROG) $(PROGRAMS) $(DESTDIR)$(PROGRAMS_INSTALL_DIR)
+       $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
+       $(INSTALL_PROG) $(PROGRAMS) $(DESTDIR)$(PRIVATE_BINDIR)
 
 
 .PHONY: clean

diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile
index e4f27c673df69ad764219e854034d836d94e6242..1b345657ea455bad3f4ac4040e330b14e5d0638d 100644 (file)
--- a/tools/xentrace/Makefile
+++ b/tools/xentrace/Makefile
@@ -37,11 +37,11 @@ build: $(BIN) $(LIBBIN)
 .PHONY: install
 install: build
        $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
-       [ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/xen/bin
+       [ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
        $(INSTALL_DIR) $(DESTDIR)$(MAN1DIR)
        $(INSTALL_DIR) $(DESTDIR)$(MAN8DIR)
        $(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)$(BINDIR)
-       [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBDIR)/xen/bin
+       [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(PRIVATE_BINDIR)
        $(INSTALL_DATA) $(MAN1) $(DESTDIR)$(MAN1DIR)
        $(INSTALL_DATA) $(MAN8) $(DESTDIR)$(MAN8DIR)