Bastian Blank
2008-Jan-26 14:03 UTC
[Xen-devel] [PATCH 2/5] makefiles - Add PRIVATE_BINDIR
# HG changeset patch # User Bastian Blank <waldi@debian.org> # Date 1201355693 -3600 # Node ID ad44ade5e921149682e3b3452826a7a74b6d62cc # Parent a838aeab515a9c5c1bfd0d81ee466381d06d6d0d Add PRIVATE_BINDIR. Use it. Signed-off-by: Bastian Blank <waldi@debian.org> diff -r a838aeab515a -r ad44ade5e921 config/StdGNU.mk --- a/config/StdGNU.mk Sat Jan 26 14:54:53 2008 +0100 +++ b/config/StdGNU.mk Sat Jan 26 14:54:53 2008 +0100 @@ -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 a838aeab515a -r ad44ade5e921 config/SunOS.mk --- a/config/SunOS.mk Sat Jan 26 14:54:53 2008 +0100 +++ b/config/SunOS.mk Sat Jan 26 14:54:53 2008 +0100 @@ -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 a838aeab515a -r ad44ade5e921 tools/console/Makefile --- a/tools/console/Makefile Sat Jan 26 14:54:53 2008 +0100 +++ b/tools/console/Makefile Sat Jan 26 14:54:53 2008 +0100 @@ -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 a838aeab515a -r ad44ade5e921 tools/debugger/xenitp/Makefile --- a/tools/debugger/xenitp/Makefile Sat Jan 26 14:54:53 2008 +0100 +++ b/tools/debugger/xenitp/Makefile Sat Jan 26 14:54:53 2008 +0100 @@ -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 a838aeab515a -r ad44ade5e921 tools/xcutils/Makefile --- a/tools/xcutils/Makefile Sat Jan 26 14:54:53 2008 +0100 +++ b/tools/xcutils/Makefile Sat Jan 26 14:54:53 2008 +0100 @@ -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 a838aeab515a -r ad44ade5e921 tools/xentrace/Makefile --- a/tools/xentrace/Makefile Sat Jan 26 14:54:53 2008 +0100 +++ b/tools/xentrace/Makefile Sat Jan 26 14:54:53 2008 +0100 @@ -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-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel