diff options
| -rw-r--r-- | config/NetBSD.mk | 4 | ||||
| -rw-r--r-- | config/StdGNU.mk | 3 | ||||
| -rw-r--r-- | stubdom/Makefile | 12 | ||||
| -rw-r--r-- | tools/firmware/Makefile | 3 | ||||
| -rw-r--r-- | tools/hotplug/NetBSD/Makefile | 8 |
5 files changed, 17 insertions, 13 deletions
diff --git a/config/NetBSD.mk b/config/NetBSD.mk index 7e64541421..19bc25d56f 100644 --- a/config/NetBSD.mk +++ b/config/NetBSD.mk @@ -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 --git a/config/StdGNU.mk b/config/StdGNU.mk index aaa89a2664..d3d69bf944 100644 --- a/config/StdGNU.mk +++ b/config/StdGNU.mk @@ -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 --git a/stubdom/Makefile b/stubdom/Makefile index 39872189ca..dcb614fc85 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -314,14 +314,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 --git a/tools/firmware/Makefile b/tools/firmware/Makefile index 78dd1b56cb..2fb6035956 100644 --- a/tools/firmware/Makefile +++ b/tools/firmware/Makefile @@ -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 --git a/tools/hotplug/NetBSD/Makefile b/tools/hotplug/NetBSD/Makefile index 1d369eaf9a..8577a6f2e5 100644 --- a/tools/hotplug/NetBSD/Makefile +++ b/tools/hotplug/NetBSD/Makefile @@ -2,14 +2,12 @@ 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 +25,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); \ |