# HG changeset patch # User Bastian Blank <waldi@debian.org> # Date 1200745316 -3600 # Node ID cb78b5a0a34390592eb66590150bda0f3aaf2d1c # Parent 40573975eba54c8eb14b41b4bcf8645568308108 Add BINDIR. Use it. Signed-off-by: Bastian Blank <waldi@debian.org> diff -r 40573975eba5 -r cb78b5a0a343 config/StdGNU.mk --- a/config/StdGNU.mk Sat Jan 19 13:21:56 2008 +0100 +++ b/config/StdGNU.mk Sat Jan 19 13:21:56 2008 +0100 @@ -18,6 +18,7 @@ INSTALL_PROG = $(INSTALL) -m0755 -p INSTALL_PROG = $(INSTALL) -m0755 -p PREFIX = /usr +BINDIR = $(PREFIX)/bin INCLUDEDIR = $(PREFIX)/include LIBDIR = $(PREFIX)/lib LIBDIR_x86_64 = $(PREFIX)/lib64 diff -r 40573975eba5 -r cb78b5a0a343 config/SunOS.mk --- a/config/SunOS.mk Sat Jan 19 13:21:56 2008 +0100 +++ b/config/SunOS.mk Sat Jan 19 13:21:56 2008 +0100 @@ -19,6 +19,7 @@ INSTALL_PROG = $(INSTALL) -m0755 -p INSTALL_PROG = $(INSTALL) -m0755 -p PREFIX = /usr +BINDIR = $(PREFIX)/bin INCLUDEDIR = $(PREFIX)/include LIBDIR = $(PREFIX)/lib LIBDIR_x86_64 = $(PREFIX)/lib/amd64 diff -r 40573975eba5 -r cb78b5a0a343 tools/debugger/xenitp/Makefile --- a/tools/debugger/xenitp/Makefile Sat Jan 19 13:21:56 2008 +0100 +++ b/tools/debugger/xenitp/Makefile Sat Jan 19 13:21:56 2008 +0100 @@ -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 -r 40573975eba5 -r cb78b5a0a343 tools/firmware/hvmloader/acpi/Makefile --- a/tools/firmware/hvmloader/acpi/Makefile Sat Jan 19 13:21:56 2008 +0100 +++ b/tools/firmware/hvmloader/acpi/Makefile Sat Jan 19 13:21:56 2008 +0100 @@ -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 -r 40573975eba5 -r cb78b5a0a343 tools/misc/Makefile --- a/tools/misc/Makefile Sat Jan 19 13:21:56 2008 +0100 +++ b/tools/misc/Makefile Sat Jan 19 13:21:56 2008 +0100 @@ -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 -r 40573975eba5 -r cb78b5a0a343 tools/misc/lomount/Makefile --- a/tools/misc/lomount/Makefile Sat Jan 19 13:21:56 2008 +0100 +++ b/tools/misc/lomount/Makefile Sat Jan 19 13:21:56 2008 +0100 @@ -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 -r 40573975eba5 -r cb78b5a0a343 tools/misc/miniterm/Makefile --- a/tools/misc/miniterm/Makefile Sat Jan 19 13:21:56 2008 +0100 +++ b/tools/misc/miniterm/Makefile Sat Jan 19 13:21:56 2008 +0100 @@ -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 -r 40573975eba5 -r cb78b5a0a343 tools/xenstore/Makefile --- a/tools/xenstore/Makefile Sat Jan 19 13:21:56 2008 +0100 +++ b/tools/xenstore/Makefile Sat Jan 19 13:21:56 2008 +0100 @@ -81,13 +81,13 @@ install: all 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 -r 40573975eba5 -r cb78b5a0a343 tools/xentrace/Makefile --- a/tools/xentrace/Makefile Sat Jan 19 13:21:56 2008 +0100 +++ b/tools/xentrace/Makefile Sat Jan 19 13:21:56 2008 +0100 @@ -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 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel