[Xen-changelog] [xen-unstable] Add PRIVATE_BINDIR. Use it.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1201358523 0
# Node ID 221b867ee084d38af4a4b6ff5e5a2887ea941312
# Parent  414b37f60e627f67db3483bccba450251e19924b
Add PRIVATE_BINDIR. Use it.

Signed-off-by: Bastian Blank <waldi@xxxxxxxxxx>
---
 config/StdGNU.mk               |    3 +++
 config/SunOS.mk                |    3 +++
 tools/console/Makefile         |    6 ++----
 tools/debugger/xenitp/Makefile |    4 ++--
 tools/xcutils/Makefile         |    7 ++-----
 tools/xentrace/Makefile        |    4 ++--
 6 files changed, 14 insertions(+), 13 deletions(-)

diff -r 414b37f60e62 -r 221b867ee084 config/StdGNU.mk
--- a/config/StdGNU.mk  Sat Jan 26 14:41:39 2008 +0000
+++ b/config/StdGNU.mk  Sat Jan 26 14:42:03 2008 +0000
@@ -27,6 +27,9 @@ MAN8DIR = $(MANDIR)/man8
 MAN8DIR = $(MANDIR)/man8
 SBINDIR = $(PREFIX)/sbin
 
+PRIVATE_PREFIX = $(LIBDIR)/xen
+PRIVATE_BINDIR = $(PRIVATE_PREFIX)/bin
+
 SOCKET_LIBS =
 CURSES_LIBS = -lncurses
 UTIL_LIBS = -lutil
diff -r 414b37f60e62 -r 221b867ee084 config/SunOS.mk
--- a/config/SunOS.mk   Sat Jan 26 14:41:39 2008 +0000
+++ b/config/SunOS.mk   Sat Jan 26 14:42:03 2008 +0000
@@ -28,6 +28,9 @@ MAN8DIR = $(MANDIR)/man8
 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 -r 414b37f60e62 -r 221b867ee084 tools/console/Makefile
--- a/tools/console/Makefile    Sat Jan 26 14:41:39 2008 +0000
+++ b/tools/console/Makefile    Sat Jan 26 14:42:03 2008 +0000
@@ -1,8 +1,6 @@
 
 XEN_ROOT=../..
 include $(XEN_ROOT)/tools/Rules.mk
-
-CLIENT_INSTALL_DIR = $(LIBDIR)/xen/bin
 
 CFLAGS  += -Werror
 
@@ -32,5 +30,5 @@ install: $(BIN)
 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 -r 414b37f60e62 -r 221b867ee084 tools/debugger/xenitp/Makefile
--- a/tools/debugger/xenitp/Makefile    Sat Jan 26 14:41:39 2008 +0000
+++ b/tools/debugger/xenitp/Makefile    Sat Jan 26 14:42:03 2008 +0000
@@ -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 -r 414b37f60e62 -r 221b867ee084 tools/xcutils/Makefile
--- a/tools/xcutils/Makefile    Sat Jan 26 14:41:39 2008 +0000
+++ b/tools/xcutils/Makefile    Sat Jan 26 14:42:03 2008 +0000
@@ -10,8 +10,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)
 
@@ -37,9 +35,8 @@ build: $(PROGRAMS)
 
 .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 -r 414b37f60e62 -r 221b867ee084 tools/xentrace/Makefile
--- a/tools/xentrace/Makefile   Sat Jan 26 14:41:39 2008 +0000
+++ b/tools/xentrace/Makefile   Sat Jan 26 14:42:03 2008 +0000
@@ -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)
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog