From: Christoph Egger Subject: [PATCH] build system cleanup Date: Thu, 19 Mar 2009 14:52:14 +0100 Message-ID: <200903191452.14841.Christoph.Egger@amd.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary-00=_O4kwJ+k7O5fOv0U" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com Cc: Ian Jackson , Keir Fraser List-Id: xen-devel@lists.xenproject.org --Boundary-00=_O4kwJ+k7O5fOv0U Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline Hi, attached patches make xen buildsystem get rid of some hardcoded install paths. The 'install.diff' is for the xen -unstable mercurial repository, the 'ioemu_install.diff' is for the ioemu git tree. Signed-off-by: Christoph Egger -- ---to satisfy European Law for business letters: Advanced Micro Devices GmbH Karl-Hammerschmidt-Str. 34, 85609 Dornach b. Muenchen Geschaeftsfuehrer: Jochen Polster, Thomas M. McCoy, Giuliano Meroni Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen Registergericht Muenchen, HRB Nr. 43632 --Boundary-00=_O4kwJ+k7O5fOv0U Content-Type: text/x-diff; charset="us-ascii"; name="install.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="install.diff" diff -r 44d76cbe74ec config/NetBSD.mk --- a/config/NetBSD.mk Thu Mar 19 10:24:48 2009 +0000 +++ b/config/NetBSD.mk Thu Mar 19 14:31:39 2009 +0100 @@ -2,3 +2,7 @@ include $(XEN_ROOT)/config/StdGNU.mk # Override settings for this OS CURSES_LIBS = -lcurses + +LIBLEAFDIR_x86_64 = lib +LIBEXEC = $(PREFIX)/libexec +PRIVATE_BINDIR = $(BINDIR) diff -r 44d76cbe74ec config/StdGNU.mk --- a/config/StdGNU.mk Thu Mar 19 10:24:48 2009 +0000 +++ b/config/StdGNU.mk Thu Mar 19 14:31:39 2009 +0100 @@ -25,9 +25,12 @@ PREFIX ?= /usr BINDIR = $(PREFIX)/bin INCLUDEDIR = $(PREFIX)/include LIBLEAFDIR = lib +LIBLEAFDIR_x86_32 = lib LIBLEAFDIR_x86_64 = lib64 LIBDIR = $(PREFIX)/$(LIBLEAFDIR) +LIBDIR_x86_32 = $(PREFIX)/$(LIBLEAFDIR_x86_32) LIBDIR_x86_64 = $(PREFIX)/$(LIBLEAFDIR_x86_64) +LIBEXEC = $(LIBDIR_x86_32)/xen/bin MANDIR = $(PREFIX)/share/man MAN1DIR = $(MANDIR)/man1 MAN8DIR = $(MANDIR)/man8 diff -r 44d76cbe74ec stubdom/Makefile --- a/stubdom/Makefile Thu Mar 19 10:24:48 2009 +0000 +++ b/stubdom/Makefile Thu Mar 19 14:31:39 2009 +0100 @@ -314,14 +315,14 @@ install-readme: $(INSTALL_DATA) README $(DESTDIR)$(DOCDIR)/README.stubdom install-ioemu: ioemu-stubdom - $(INSTALL_DIR) "$(DESTDIR)/usr/lib/xen/bin" - $(INSTALL_PROG) stubdom-dm "$(DESTDIR)/usr/lib/xen/bin" - $(INSTALL_DIR) "$(DESTDIR)/usr/lib/xen/boot" - $(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-ioemu/mini-os.gz "$(DESTDIR)/usr/lib/xen/boot/ioemu-stubdom.gz" + $(INSTALL_DIR) "$(DESTDIR)$(LIBEXEC)" + $(INSTALL_PROG) stubdom-dm "$(DESTDIR)$(LIBEXEC)" + $(INSTALL_DIR) "$(DESTDIR)$(LIBDIR_x86_32)/xen/boot" + $(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-ioemu/mini-os.gz "$(DESTDIR)$(LIBDIR_x86_32)/xen/boot/ioemu-stubdom.gz" install-grub: pv-grub - $(INSTALL_DIR) "$(DESTDIR)/usr/lib/xen/boot" - $(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-grub/mini-os.gz "$(DESTDIR)/usr/lib/xen/boot/pv-grub-$(XEN_TARGET_ARCH).gz" + $(INSTALL_DIR) "$(DESTDIR)$(LIBDIR_x86_32)/xen/boot" + $(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-grub/mini-os.gz "$(DESTDIR)$(LIBDIR_x86_32)/xen/boot/pv-grub-$(XEN_TARGET_ARCH).gz" ####### # clean diff -r 44d76cbe74ec tools/firmware/Makefile --- a/tools/firmware/Makefile Thu Mar 19 10:24:48 2009 +0000 +++ b/tools/firmware/Makefile Thu Mar 19 14:31:39 2009 +0100 @@ -2,9 +2,8 @@ XEN_ROOT = ../.. include $(XEN_ROOT)/tools/Rules.mk # hvmloader is a 32-bit protected mode binary. -# It belongs in /usr/lib, not /usr/lib64. TARGET := hvmloader/hvmloader -INST_DIR := $(DESTDIR)/usr/lib/xen/boot +INST_DIR := $(DESTDIR)$(LIBDIR_x86_32)/xen/boot SUBDIRS := SUBDIRS += rombios diff -r 44d76cbe74ec tools/hotplug/NetBSD/Makefile --- a/tools/hotplug/NetBSD/Makefile Thu Mar 19 10:24:48 2009 +0000 +++ b/tools/hotplug/NetBSD/Makefile Thu Mar 19 14:31:39 2009 +0100 @@ -2,14 +2,14 @@ XEN_ROOT = ../../../ include $(XEN_ROOT)/tools/Rules.mk # Xen configuration dir and configs to go there. -XEN_CONFIG_DIR = $(PREFIX)/etc/xen +XEN_CONFIG_DIR = /etc/xen # Xen script dir and scripts to go there. -XEN_SCRIPT_DIR = $(PREFIX)/etc/xen/scripts +XEN_SCRIPT_DIR = $(XEN_CONFIG_DIR)/scripts XEN_SCRIPTS = XEN_SCRIPTS += block-nbsd -XEN_SCRIPTS += hvm-nbsd -XEN_SCRIPTS += netbsd1-nbsd XEN_SCRIPTS += qemu-ifup-nbsd XEN_SCRIPTS += vif-bridge-nbsd XEN_SCRIPTS += vif-ip-nbsd @@ -27,7 +27,7 @@ install: all install-scripts .PHONY: install-scripts install-scripts: - $(INSTALL_DATA_DIR) $(DESTDIR)$(XEN_SCRIPT_DIR) + $(INSTALL_DIR) $(DESTDIR)$(XEN_SCRIPT_DIR) set -e; for i in $(XEN_SCRIPTS); \ do \ $(INSTALL_DATA) $$i $(DESTDIR)$(XEN_SCRIPT_DIR); \ diff -r 44d76cbe74ec config/SunOS.mk --- a/config/SunOS.mk Thu Mar 19 10:24:48 2009 +0000 +++ b/config/SunOS.mk Thu Mar 19 14:39:08 2009 +0100 @@ -23,9 +23,12 @@ PREFIX ?= /usr BINDIR = $(PREFIX)/bin INCLUDEDIR = $(PREFIX)/include LIBLEAFDIR = lib +LIBLEAFDIR_x86_32 = lib LIBLEAFDIR_x86_64 = lib/amd64 LIBDIR = $(PREFIX)/$(LIBLEAFDIR) +LIBDIR_x86_32 = $(PREFIX)/$(LIBLEAFDIR_x86_32) LIBDIR_x86_64 = $(PREFIX)/$(LIBLEAFDIR_x86_64) +LIBEXEC = $(LIBDIR_x86_32)/xen/bin MANDIR = $(PREFIX)/share/man MAN1DIR = $(MANDIR)/man1 MAN8DIR = $(MANDIR)/man8 --Boundary-00=_O4kwJ+k7O5fOv0U Content-Type: text/x-diff; charset="us-ascii"; name="ioemu_install.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="ioemu_install.diff" diff --git a/xen-config.mak b/xen-config.mak index 6210619..10d0ca1 100644 --- a/xen-config.mak +++ b/xen-config.mak @@ -8,4 +8,4 @@ CONFIG_SOFTMMU=yes CFLAGS += -I$(QEMU_ROOT)/hw -bindir = ${prefix}/${LIBLEAFDIR}/xen/bin +bindir = ${prefix}/${LIBEXEC} --Boundary-00=_O4kwJ+k7O5fOv0U Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --Boundary-00=_O4kwJ+k7O5fOv0U--