diff options
| -rw-r--r-- | config/StdGNU.mk | 1 | ||||
| -rw-r--r-- | config/SunOS.mk | 1 | ||||
| -rw-r--r-- | tools/debugger/xenitp/Makefile | 4 | ||||
| -rw-r--r-- | tools/firmware/hvmloader/acpi/Makefile | 2 | ||||
| -rw-r--r-- | tools/misc/Makefile | 4 | ||||
| -rw-r--r-- | tools/misc/lomount/Makefile | 2 | ||||
| -rw-r--r-- | tools/misc/miniterm/Makefile | 4 | ||||
| -rw-r--r-- | tools/xenstore/Makefile | 8 | ||||
| -rw-r--r-- | tools/xentrace/Makefile | 4 |
9 files changed, 16 insertions, 14 deletions
diff --git a/config/StdGNU.mk b/config/StdGNU.mk index 4230923d4e..dd9e62c464 100644 --- a/config/StdGNU.mk +++ b/config/StdGNU.mk @@ -18,6 +18,7 @@ INSTALL_DATA = $(INSTALL) -m0644 -p INSTALL_PROG = $(INSTALL) -m0755 -p PREFIX ?= /usr +BINDIR = $(PREFIX)/bin INCLUDEDIR = $(PREFIX)/include LIBDIR = $(PREFIX)/lib LIBDIR_x86_64 = $(PREFIX)/lib64 diff --git a/config/SunOS.mk b/config/SunOS.mk index a76891b381..7f11d4d9dc 100644 --- a/config/SunOS.mk +++ b/config/SunOS.mk @@ -19,6 +19,7 @@ INSTALL_DATA = $(INSTALL) -m0644 -p INSTALL_PROG = $(INSTALL) -m0755 -p PREFIX ?= /usr +BINDIR = $(PREFIX)/bin INCLUDEDIR = $(PREFIX)/include LIBDIR = $(PREFIX)/lib LIBDIR_x86_64 = $(PREFIX)/lib/amd64 diff --git a/tools/debugger/xenitp/Makefile b/tools/debugger/xenitp/Makefile index 42be8f34c9..94c61fde99 100644 --- a/tools/debugger/xenitp/Makefile +++ b/tools/debugger/xenitp/Makefile @@ -26,13 +26,13 @@ build: $(BIN) $(LIBBIN) .PHONY: install install: build - [ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin + $(INSTALL_DIR) $(DESTDIR)$(BINDIR) [ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/xen/bin [ -d $(DESTDIR)/usr/share/man/man1 ] || \ $(INSTALL_DIR) $(DESTDIR)/usr/share/man/man1 [ -d $(DESTDIR)/usr/share/man/man8 ] || \ $(INSTALL_DIR) $(DESTDIR)/usr/share/man/man8 - $(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)/usr/bin + $(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)$(BINDIR) [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBDIR)/xen/bin $(INSTALL_DATA) $(MAN1) $(DESTDIR)/usr/share/man/man1 $(INSTALL_DATA) $(MAN8) $(DESTDIR)/usr/share/man/man8 diff --git a/tools/firmware/hvmloader/acpi/Makefile b/tools/firmware/hvmloader/acpi/Makefile index c5a1283a9e..07981efffb 100644 --- a/tools/firmware/hvmloader/acpi/Makefile +++ b/tools/firmware/hvmloader/acpi/Makefile @@ -60,7 +60,7 @@ iasl: wget $(IASL_URL) tar xzf $(IASL_VER).tar.gz make -C $(IASL_VER)/compiler - $(INSTALL_PROG) $(IASL_VER)/compiler/iasl /usr/bin/iasl + $(INSTALL_PROG) $(IASL_VER)/compiler/iasl $(DESTDIR)$(BINDIR)/iasl acpi.a: $(OBJS) $(AR) rc $@ $(OBJS) diff --git a/tools/misc/Makefile b/tools/misc/Makefile index f9dcbb22ad..d4bde6be97 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -29,9 +29,9 @@ build: $(TARGETS) .PHONY: install install: build - [ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin + $(INSTALL_DIR) $(DESTDIR)$(BINDIR) [ -d $(DESTDIR)/usr/sbin ] || $(INSTALL_DIR) $(DESTDIR)/usr/sbin - $(INSTALL_PROG) $(INSTALL_BIN) $(DESTDIR)/usr/bin + $(INSTALL_PROG) $(INSTALL_BIN) $(DESTDIR)$(BINDIR) $(INSTALL_PROG) $(INSTALL_SBIN) $(DESTDIR)/usr/sbin set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d install-recurse; done diff --git a/tools/misc/lomount/Makefile b/tools/misc/lomount/Makefile index 77ba4f80df..7eafce16e5 100644 --- a/tools/misc/lomount/Makefile +++ b/tools/misc/lomount/Makefile @@ -16,7 +16,7 @@ build: $(BIN) .PHONY: install install install-recurse: build - $(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)/usr/bin + $(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)$(BINDIR) .PHONY: clean clean: diff --git a/tools/misc/miniterm/Makefile b/tools/misc/miniterm/Makefile index ec063746f4..116ef1f6b3 100644 --- a/tools/misc/miniterm/Makefile +++ b/tools/misc/miniterm/Makefile @@ -8,8 +8,8 @@ all: $(TARGET) .PHONY: install install: all - [ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin - $(INSTALL_PROG) $(TARGET) $(DESTDIR)/usr/bin + $(INSTALL_DIR) $(DESTDIR)$(BINDIR) + $(INSTALL_PROG) $(TARGET) $(DESTDIR)$(BINDIR) .PHONY: install-recurse : No sense in installing miniterm on the Xen box. diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index 2652b1e3ec..ab8cd1e8fc 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -81,13 +81,13 @@ tarball: clean install: all $(INSTALL_DIR) $(DESTDIR)/var/run/xenstored $(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored - $(INSTALL_DIR) $(DESTDIR)/usr/bin + $(INSTALL_DIR) $(DESTDIR)$(BINDIR) $(INSTALL_DIR) $(DESTDIR)/usr/sbin $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) $(INSTALL_PROG) xenstored $(DESTDIR)/usr/sbin - $(INSTALL_PROG) $(CLIENTS) $(DESTDIR)/usr/bin - $(INSTALL_PROG) xenstore-control $(DESTDIR)/usr/bin - $(INSTALL_PROG) xenstore-ls $(DESTDIR)/usr/bin + $(INSTALL_PROG) $(CLIENTS) $(DESTDIR)$(BINDIR) + $(INSTALL_PROG) xenstore-control $(DESTDIR)$(BINDIR) + $(INSTALL_PROG) xenstore-ls $(DESTDIR)$(BINDIR) $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) $(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenstore.so.$(MAJOR) diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile index 2032405c9e..5e46c90310 100644 --- a/tools/xentrace/Makefile +++ b/tools/xentrace/Makefile @@ -35,13 +35,13 @@ build: $(BIN) $(LIBBIN) .PHONY: install install: build - [ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin + $(INSTALL_DIR) $(DESTDIR)$(BINDIR) [ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/xen/bin [ -d $(DESTDIR)/usr/share/man/man1 ] || \ $(INSTALL_DIR) $(DESTDIR)/usr/share/man/man1 [ -d $(DESTDIR)/usr/share/man/man8 ] || \ $(INSTALL_DIR) $(DESTDIR)/usr/share/man/man8 - $(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)/usr/bin + $(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)$(BINDIR) [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBDIR)/xen/bin $(INSTALL_DATA) $(MAN1) $(DESTDIR)/usr/share/man/man1 $(INSTALL_DATA) $(MAN8) $(DESTDIR)/usr/share/man/man8 |