ia64/xen-unstable

changeset 16843:5e03f0bc0aa2

Add BINDIR. Use it.

Signed-off-by: Bastian Blank <waldi@debian.org>
author Keir Fraser <keir.fraser@citrix.com>
date Tue Jan 22 14:31:10 2008 +0000 (2008-01-22)
parents 89995ccec15a
children 51a7e508bd01
files config/StdGNU.mk config/SunOS.mk tools/debugger/xenitp/Makefile tools/firmware/hvmloader/acpi/Makefile tools/misc/Makefile tools/misc/lomount/Makefile tools/misc/miniterm/Makefile tools/xenstore/Makefile tools/xentrace/Makefile
line diff
     1.1 --- a/config/StdGNU.mk	Tue Jan 22 14:30:21 2008 +0000
     1.2 +++ b/config/StdGNU.mk	Tue Jan 22 14:31:10 2008 +0000
     1.3 @@ -18,6 +18,7 @@ INSTALL_DATA = $(INSTALL) -m0644 -p
     1.4  INSTALL_PROG = $(INSTALL) -m0755 -p
     1.5  
     1.6  PREFIX ?= /usr
     1.7 +BINDIR = $(PREFIX)/bin
     1.8  INCLUDEDIR = $(PREFIX)/include
     1.9  LIBDIR = $(PREFIX)/lib
    1.10  LIBDIR_x86_64 = $(PREFIX)/lib64
     2.1 --- a/config/SunOS.mk	Tue Jan 22 14:30:21 2008 +0000
     2.2 +++ b/config/SunOS.mk	Tue Jan 22 14:31:10 2008 +0000
     2.3 @@ -19,6 +19,7 @@ INSTALL_DATA = $(INSTALL) -m0644 -p
     2.4  INSTALL_PROG = $(INSTALL) -m0755 -p
     2.5  
     2.6  PREFIX ?= /usr
     2.7 +BINDIR = $(PREFIX)/bin
     2.8  INCLUDEDIR = $(PREFIX)/include
     2.9  LIBDIR = $(PREFIX)/lib
    2.10  LIBDIR_x86_64 = $(PREFIX)/lib/amd64
     3.1 --- a/tools/debugger/xenitp/Makefile	Tue Jan 22 14:30:21 2008 +0000
     3.2 +++ b/tools/debugger/xenitp/Makefile	Tue Jan 22 14:31:10 2008 +0000
     3.3 @@ -26,13 +26,13 @@ build: $(BIN) $(LIBBIN)
     3.4  
     3.5  .PHONY: install
     3.6  install: build
     3.7 -	[ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin
     3.8 +	$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
     3.9  	[ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/xen/bin
    3.10  	[ -d $(DESTDIR)/usr/share/man/man1 ] || \
    3.11  		$(INSTALL_DIR) $(DESTDIR)/usr/share/man/man1
    3.12  	[ -d $(DESTDIR)/usr/share/man/man8 ] || \
    3.13  		$(INSTALL_DIR) $(DESTDIR)/usr/share/man/man8
    3.14 -	$(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)/usr/bin
    3.15 +	$(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)$(BINDIR)
    3.16  	[ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBDIR)/xen/bin
    3.17  	$(INSTALL_DATA) $(MAN1) $(DESTDIR)/usr/share/man/man1
    3.18  	$(INSTALL_DATA) $(MAN8) $(DESTDIR)/usr/share/man/man8
     4.1 --- a/tools/firmware/hvmloader/acpi/Makefile	Tue Jan 22 14:30:21 2008 +0000
     4.2 +++ b/tools/firmware/hvmloader/acpi/Makefile	Tue Jan 22 14:31:10 2008 +0000
     4.3 @@ -60,7 +60,7 @@ iasl:
     4.4  	wget $(IASL_URL)
     4.5  	tar xzf $(IASL_VER).tar.gz
     4.6  	make -C $(IASL_VER)/compiler
     4.7 -	$(INSTALL_PROG) $(IASL_VER)/compiler/iasl /usr/bin/iasl
     4.8 +	$(INSTALL_PROG) $(IASL_VER)/compiler/iasl $(DESTDIR)$(BINDIR)/iasl
     4.9  
    4.10  acpi.a: $(OBJS)
    4.11  	$(AR) rc $@ $(OBJS)
     5.1 --- a/tools/misc/Makefile	Tue Jan 22 14:30:21 2008 +0000
     5.2 +++ b/tools/misc/Makefile	Tue Jan 22 14:31:10 2008 +0000
     5.3 @@ -29,9 +29,9 @@ build: $(TARGETS)
     5.4  
     5.5  .PHONY: install
     5.6  install: build
     5.7 -	[ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin
     5.8 +	$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
     5.9  	[ -d $(DESTDIR)/usr/sbin ] || $(INSTALL_DIR) $(DESTDIR)/usr/sbin
    5.10 -	$(INSTALL_PROG) $(INSTALL_BIN) $(DESTDIR)/usr/bin
    5.11 +	$(INSTALL_PROG) $(INSTALL_BIN) $(DESTDIR)$(BINDIR)
    5.12  	$(INSTALL_PROG) $(INSTALL_SBIN) $(DESTDIR)/usr/sbin
    5.13  	set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d install-recurse; done
    5.14  
     6.1 --- a/tools/misc/lomount/Makefile	Tue Jan 22 14:30:21 2008 +0000
     6.2 +++ b/tools/misc/lomount/Makefile	Tue Jan 22 14:31:10 2008 +0000
     6.3 @@ -16,7 +16,7 @@ build: $(BIN)
     6.4  
     6.5  .PHONY: install
     6.6  install install-recurse: build
     6.7 -	$(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)/usr/bin
     6.8 +	$(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)$(BINDIR)
     6.9  
    6.10  .PHONY: clean
    6.11  clean:
     7.1 --- a/tools/misc/miniterm/Makefile	Tue Jan 22 14:30:21 2008 +0000
     7.2 +++ b/tools/misc/miniterm/Makefile	Tue Jan 22 14:31:10 2008 +0000
     7.3 @@ -8,8 +8,8 @@ all: $(TARGET)
     7.4  
     7.5  .PHONY: install
     7.6  install: all
     7.7 -	[ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin
     7.8 -	$(INSTALL_PROG) $(TARGET) $(DESTDIR)/usr/bin
     7.9 +	$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
    7.10 +	$(INSTALL_PROG) $(TARGET) $(DESTDIR)$(BINDIR)
    7.11  
    7.12  .PHONY: install-recurse
    7.13  	: No sense in installing miniterm on the Xen box.
     8.1 --- a/tools/xenstore/Makefile	Tue Jan 22 14:30:21 2008 +0000
     8.2 +++ b/tools/xenstore/Makefile	Tue Jan 22 14:31:10 2008 +0000
     8.3 @@ -81,13 +81,13 @@ tarball: clean
     8.4  install: all
     8.5  	$(INSTALL_DIR) $(DESTDIR)/var/run/xenstored
     8.6  	$(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored
     8.7 -	$(INSTALL_DIR) $(DESTDIR)/usr/bin
     8.8 +	$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
     8.9  	$(INSTALL_DIR) $(DESTDIR)/usr/sbin
    8.10  	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
    8.11  	$(INSTALL_PROG) xenstored $(DESTDIR)/usr/sbin
    8.12 -	$(INSTALL_PROG) $(CLIENTS) $(DESTDIR)/usr/bin
    8.13 -	$(INSTALL_PROG) xenstore-control $(DESTDIR)/usr/bin
    8.14 -	$(INSTALL_PROG) xenstore-ls $(DESTDIR)/usr/bin
    8.15 +	$(INSTALL_PROG) $(CLIENTS) $(DESTDIR)$(BINDIR)
    8.16 +	$(INSTALL_PROG) xenstore-control $(DESTDIR)$(BINDIR)
    8.17 +	$(INSTALL_PROG) xenstore-ls $(DESTDIR)$(BINDIR)
    8.18  	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
    8.19  	$(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
    8.20  	ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenstore.so.$(MAJOR)
     9.1 --- a/tools/xentrace/Makefile	Tue Jan 22 14:30:21 2008 +0000
     9.2 +++ b/tools/xentrace/Makefile	Tue Jan 22 14:31:10 2008 +0000
     9.3 @@ -35,13 +35,13 @@ build: $(BIN) $(LIBBIN)
     9.4  
     9.5  .PHONY: install
     9.6  install: build
     9.7 -	[ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin
     9.8 +	$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
     9.9  	[ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/xen/bin
    9.10  	[ -d $(DESTDIR)/usr/share/man/man1 ] || \
    9.11  		$(INSTALL_DIR) $(DESTDIR)/usr/share/man/man1
    9.12  	[ -d $(DESTDIR)/usr/share/man/man8 ] || \
    9.13  		$(INSTALL_DIR) $(DESTDIR)/usr/share/man/man8
    9.14 -	$(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)/usr/bin
    9.15 +	$(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)$(BINDIR)
    9.16  	[ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBDIR)/xen/bin
    9.17  	$(INSTALL_DATA) $(MAN1) $(DESTDIR)/usr/share/man/man1
    9.18  	$(INSTALL_DATA) $(MAN8) $(DESTDIR)/usr/share/man/man8