diff options
-rw-r--r-- | config/StdGNU.mk | 3 | ||||
-rw-r--r-- | config/SunOS.mk | 3 | ||||
-rw-r--r-- | tools/console/Makefile | 6 | ||||
-rw-r--r-- | tools/debugger/xenitp/Makefile | 4 | ||||
-rw-r--r-- | tools/xcutils/Makefile | 7 | ||||
-rw-r--r-- | tools/xentrace/Makefile | 4 |
6 files changed, 14 insertions, 13 deletions
diff --git a/config/StdGNU.mk b/config/StdGNU.mk index e1a8b6f6be..ed383cf25d 100644 --- 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 3992689f83..16163b6820 100644 --- 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 85c2ad8574..1e60bd2ee0 100644 --- 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 43049de85f..3b1e61b435 100644 --- 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 4c004750bf..b7714c1f38 100644 --- 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 e4f27c673d..1b345657ea 100644 --- 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) |