build system cleanup
PATCH 1/1 build system cleanup
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 <[email protected]>
Signature · 6 lines
---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
config/NetBSD.mk +4 -0
@@ -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)
config/StdGNU.mk +3 -0
@@ -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
stubdom/Makefile +6 -6
@@ -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
tools/firmware/Makefile +1 -2
@@ -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
tools/hotplug/NetBSD/Makefile +3 -5
@@ -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); \
config/SunOS.mk +3 -0
@@ -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
xen-config.mak +1 -1
@@ -8,4 +8,4 @@ CONFIG_SOFTMMU=yes CFLAGS += -I$(QEMU_ROOT)/hw -bindir = ${prefix}/${LIBLEAFDIR}/xen/bin +bindir = ${prefix}/${LIBEXEC}
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel