ia64/xen-unstable

changeset 16899:221b867ee084

Add PRIVATE_BINDIR. Use it.

Signed-off-by: Bastian Blank <waldi@debian.org>
author Keir Fraser <keir.fraser@citrix.com>
date Sat Jan 26 14:42:03 2008 +0000 (2008-01-26)
parents 414b37f60e62
children 69b8816b5c8c
files config/StdGNU.mk config/SunOS.mk tools/console/Makefile tools/debugger/xenitp/Makefile tools/xcutils/Makefile tools/xentrace/Makefile
line diff
     1.1 --- a/config/StdGNU.mk	Sat Jan 26 14:41:39 2008 +0000
     1.2 +++ b/config/StdGNU.mk	Sat Jan 26 14:42:03 2008 +0000
     1.3 @@ -27,6 +27,9 @@ MAN1DIR = $(MANDIR)/man1
     1.4  MAN8DIR = $(MANDIR)/man8
     1.5  SBINDIR = $(PREFIX)/sbin
     1.6  
     1.7 +PRIVATE_PREFIX = $(LIBDIR)/xen
     1.8 +PRIVATE_BINDIR = $(PRIVATE_PREFIX)/bin
     1.9 +
    1.10  SOCKET_LIBS =
    1.11  CURSES_LIBS = -lncurses
    1.12  UTIL_LIBS = -lutil
     2.1 --- a/config/SunOS.mk	Sat Jan 26 14:41:39 2008 +0000
     2.2 +++ b/config/SunOS.mk	Sat Jan 26 14:42:03 2008 +0000
     2.3 @@ -28,6 +28,9 @@ MAN1DIR = $(MANDIR)/man1
     2.4  MAN8DIR = $(MANDIR)/man8
     2.5  SBINDIR = $(PREFIX)/sbin
     2.6  
     2.7 +PRIVATE_PREFIX = $(LIBDIR)/xen
     2.8 +PRIVATE_BINDIR = $(PRIVATE_PREFIX)/bin
     2.9 +
    2.10  SunOS_LIBDIR = /usr/sfw/lib
    2.11  SunOS_LIBDIR_x86_64 = /usr/sfw/lib/amd64
    2.12  
     3.1 --- a/tools/console/Makefile	Sat Jan 26 14:41:39 2008 +0000
     3.2 +++ b/tools/console/Makefile	Sat Jan 26 14:42:03 2008 +0000
     3.3 @@ -2,8 +2,6 @@
     3.4  XEN_ROOT=../..
     3.5  include $(XEN_ROOT)/tools/Rules.mk
     3.6  
     3.7 -CLIENT_INSTALL_DIR = $(LIBDIR)/xen/bin
     3.8 -
     3.9  CFLAGS  += -Werror
    3.10  
    3.11  CFLAGS  += -I $(XEN_LIBXC)
    3.12 @@ -32,5 +30,5 @@ xenconsole: $(patsubst %.c,%.o,$(wildcar
    3.13  install: $(BIN)
    3.14  	$(INSTALL_DIR) $(DESTDIR)/$(SBINDIR)
    3.15  	$(INSTALL_PROG) xenconsoled $(DESTDIR)/$(SBINDIR)
    3.16 -	$(INSTALL_DIR) $(DESTDIR)/$(CLIENT_INSTALL_DIR)
    3.17 -	$(INSTALL_PROG) xenconsole $(DESTDIR)/$(CLIENT_INSTALL_DIR)
    3.18 +	$(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
    3.19 +	$(INSTALL_PROG) xenconsole $(DESTDIR)$(PRIVATE_BINDIR)
     4.1 --- a/tools/debugger/xenitp/Makefile	Sat Jan 26 14:41:39 2008 +0000
     4.2 +++ b/tools/debugger/xenitp/Makefile	Sat Jan 26 14:42:03 2008 +0000
     4.3 @@ -27,11 +27,11 @@ build: $(BIN) $(LIBBIN)
     4.4  .PHONY: install
     4.5  install: build
     4.6  	$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
     4.7 -	[ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/xen/bin
     4.8 +	[ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
     4.9  	$(INSTALL_DIR) $(DESTDIR)$(MAN1DIR)
    4.10  	$(INSTALL_DIR) $(DESTDIR)$(MAN8DIR)
    4.11  	$(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)$(BINDIR)
    4.12 -	[ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBDIR)/xen/bin
    4.13 +	[ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(PRIVATE_BINDIR)
    4.14  	$(INSTALL_DATA) $(MAN1) $(DESTDIR)$(MAN1DIR)
    4.15  	$(INSTALL_DATA) $(MAN8) $(DESTDIR)$(MAN8DIR)
    4.16  
     5.1 --- a/tools/xcutils/Makefile	Sat Jan 26 14:41:39 2008 +0000
     5.2 +++ b/tools/xcutils/Makefile	Sat Jan 26 14:42:03 2008 +0000
     5.3 @@ -11,8 +11,6 @@
     5.4  XEN_ROOT	= ../..
     5.5  include $(XEN_ROOT)/tools/Rules.mk
     5.6  
     5.7 -PROGRAMS_INSTALL_DIR = $(LIBDIR)/xen/bin
     5.8 -
     5.9  INCLUDES += -I $(XEN_LIBXC) -I $(XEN_XENSTORE) -I$(XEN_INCLUDE)
    5.10  
    5.11  CFLAGS += -Werror
    5.12 @@ -37,9 +35,8 @@ build: $(PROGRAMS)
    5.13  
    5.14  .PHONY: install
    5.15  install: build
    5.16 -	[ -d $(DESTDIR)$(PROGRAMS_INSTALL_DIR) ] || \
    5.17 -		$(INSTALL_DIR) $(DESTDIR)$(PROGRAMS_INSTALL_DIR)
    5.18 -	$(INSTALL_PROG) $(PROGRAMS) $(DESTDIR)$(PROGRAMS_INSTALL_DIR)
    5.19 +	$(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
    5.20 +	$(INSTALL_PROG) $(PROGRAMS) $(DESTDIR)$(PRIVATE_BINDIR)
    5.21  
    5.22  
    5.23  .PHONY: clean
     6.1 --- a/tools/xentrace/Makefile	Sat Jan 26 14:41:39 2008 +0000
     6.2 +++ b/tools/xentrace/Makefile	Sat Jan 26 14:42:03 2008 +0000
     6.3 @@ -37,11 +37,11 @@ build: $(BIN) $(LIBBIN)
     6.4  .PHONY: install
     6.5  install: build
     6.6  	$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
     6.7 -	[ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/xen/bin
     6.8 +	[ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
     6.9  	$(INSTALL_DIR) $(DESTDIR)$(MAN1DIR)
    6.10  	$(INSTALL_DIR) $(DESTDIR)$(MAN8DIR)
    6.11  	$(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)$(BINDIR)
    6.12 -	[ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBDIR)/xen/bin
    6.13 +	[ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(PRIVATE_BINDIR)
    6.14  	$(INSTALL_DATA) $(MAN1) $(DESTDIR)$(MAN1DIR)
    6.15  	$(INSTALL_DATA) $(MAN8) $(DESTDIR)$(MAN8DIR)
    6.16