[Top] [All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-changelog] [xen-unstable] Add BINDIR. Use it.

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1201012270 0
# Node ID 5e03f0bc0aa2fbe8535bedca02d6ab6e4b530794
# Parent  89995ccec15a46a4e2f2b6e3ad3ce7c827a596ce
Add BINDIR. Use it.

Signed-off-by: Bastian Blank <waldi@xxxxxxxxxx>
---
 config/StdGNU.mk                       |    1 +
 config/SunOS.mk                        |    1 +
 tools/debugger/xenitp/Makefile         |    4 ++--
 tools/firmware/hvmloader/acpi/Makefile |    2 +-
 tools/misc/Makefile                    |    4 ++--
 tools/misc/lomount/Makefile            |    2 +-
 tools/misc/miniterm/Makefile           |    4 ++--
 tools/xenstore/Makefile                |    8 ++++----
 tools/xentrace/Makefile                |    4 ++--
 9 files changed, 16 insertions(+), 14 deletions(-)

diff -r 89995ccec15a -r 5e03f0bc0aa2 config/StdGNU.mk
--- a/config/StdGNU.mk  Tue Jan 22 14:30:21 2008 +0000
+++ b/config/StdGNU.mk  Tue Jan 22 14:31:10 2008 +0000
@@ -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 89995ccec15a -r 5e03f0bc0aa2 config/SunOS.mk
--- a/config/SunOS.mk   Tue Jan 22 14:30:21 2008 +0000
+++ b/config/SunOS.mk   Tue Jan 22 14:31:10 2008 +0000
@@ -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 89995ccec15a -r 5e03f0bc0aa2 tools/debugger/xenitp/Makefile
--- a/tools/debugger/xenitp/Makefile    Tue Jan 22 14:30:21 2008 +0000
+++ b/tools/debugger/xenitp/Makefile    Tue Jan 22 14:31:10 2008 +0000
@@ -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 89995ccec15a -r 5e03f0bc0aa2 tools/firmware/hvmloader/acpi/Makefile
--- a/tools/firmware/hvmloader/acpi/Makefile    Tue Jan 22 14:30:21 2008 +0000
+++ b/tools/firmware/hvmloader/acpi/Makefile    Tue Jan 22 14:31:10 2008 +0000
@@ -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 89995ccec15a -r 5e03f0bc0aa2 tools/misc/Makefile
--- a/tools/misc/Makefile       Tue Jan 22 14:30:21 2008 +0000
+++ b/tools/misc/Makefile       Tue Jan 22 14:31:10 2008 +0000
@@ -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 89995ccec15a -r 5e03f0bc0aa2 tools/misc/lomount/Makefile
--- a/tools/misc/lomount/Makefile       Tue Jan 22 14:30:21 2008 +0000
+++ b/tools/misc/lomount/Makefile       Tue Jan 22 14:31:10 2008 +0000
@@ -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 89995ccec15a -r 5e03f0bc0aa2 tools/misc/miniterm/Makefile
--- a/tools/misc/miniterm/Makefile      Tue Jan 22 14:30:21 2008 +0000
+++ b/tools/misc/miniterm/Makefile      Tue Jan 22 14:31:10 2008 +0000
@@ -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 89995ccec15a -r 5e03f0bc0aa2 tools/xenstore/Makefile
--- a/tools/xenstore/Makefile   Tue Jan 22 14:30:21 2008 +0000
+++ b/tools/xenstore/Makefile   Tue Jan 22 14:31:10 2008 +0000
@@ -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 89995ccec15a -r 5e03f0bc0aa2 tools/xentrace/Makefile
--- a/tools/xentrace/Makefile   Tue Jan 22 14:30:21 2008 +0000
+++ b/tools/xentrace/Makefile   Tue Jan 22 14:31:10 2008 +0000
@@ -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-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog

 

©2013 Xen Project, A Linux Foundation Collaborative Project. All Rights Reserved.
Linux Foundation is a registered trademark of The Linux Foundation.
Xen Project is a trademark of The Linux Foundation.

Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.