1.1 --- a/config/NetBSD.mk	Thu Mar 19 10:24:48 2009 +0000
     1.2 +++ b/config/NetBSD.mk	Thu Mar 19 14:01:56 2009 +0000
     1.3 @@ -2,3 +2,7 @@ include $(XEN_ROOT)/config/StdGNU.mk
     1.4  
     1.5  # Override settings for this OS
     1.6  CURSES_LIBS = -lcurses
     1.7 +
     1.8 +LIBLEAFDIR_x86_64 = lib
     1.9 +LIBEXEC = $(PREFIX)/libexec
    1.10 +PRIVATE_BINDIR = $(BINDIR)

     2.1 --- a/config/StdGNU.mk	Thu Mar 19 10:24:48 2009 +0000
     2.2 +++ b/config/StdGNU.mk	Thu Mar 19 14:01:56 2009 +0000
     2.3 @@ -25,9 +25,12 @@ PREFIX ?= /usr
     2.4  BINDIR = $(PREFIX)/bin
     2.5  INCLUDEDIR = $(PREFIX)/include
     2.6  LIBLEAFDIR = lib
     2.7 +LIBLEAFDIR_x86_32 = lib
     2.8  LIBLEAFDIR_x86_64 = lib64
     2.9  LIBDIR = $(PREFIX)/$(LIBLEAFDIR)
    2.10 +LIBDIR_x86_32 = $(PREFIX)/$(LIBLEAFDIR_x86_32)
    2.11  LIBDIR_x86_64 = $(PREFIX)/$(LIBLEAFDIR_x86_64)
    2.12 +LIBEXEC = $(LIBDIR_x86_32)/xen/bin
    2.13  MANDIR = $(PREFIX)/share/man
    2.14  MAN1DIR = $(MANDIR)/man1
    2.15  MAN8DIR = $(MANDIR)/man8

     3.1 --- a/stubdom/Makefile	Thu Mar 19 10:24:48 2009 +0000
     3.2 +++ b/stubdom/Makefile	Thu Mar 19 14:01:56 2009 +0000
     3.3 @@ -314,14 +314,14 @@ install-readme:
     3.4  	$(INSTALL_DATA) README $(DESTDIR)$(DOCDIR)/README.stubdom
     3.5  
     3.6  install-ioemu: ioemu-stubdom
     3.7 -	$(INSTALL_DIR) "$(DESTDIR)/usr/lib/xen/bin"
     3.8 -	$(INSTALL_PROG) stubdom-dm "$(DESTDIR)/usr/lib/xen/bin"
     3.9 -	$(INSTALL_DIR) "$(DESTDIR)/usr/lib/xen/boot"
    3.10 -	$(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-ioemu/mini-os.gz "$(DESTDIR)/usr/lib/xen/boot/ioemu-stubdom.gz"
    3.11 +	$(INSTALL_DIR) "$(DESTDIR)$(LIBEXEC)"
    3.12 +	$(INSTALL_PROG) stubdom-dm "$(DESTDIR)$(LIBEXEC)"
    3.13 +	$(INSTALL_DIR) "$(DESTDIR)$(LIBDIR_x86_32)/xen/boot"
    3.14 +	$(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-ioemu/mini-os.gz "$(DESTDIR)$(LIBDIR_x86_32)/xen/boot/ioemu-stubdom.gz"
    3.15  
    3.16  install-grub: pv-grub
    3.17 -	$(INSTALL_DIR) "$(DESTDIR)/usr/lib/xen/boot"
    3.18 -	$(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-grub/mini-os.gz "$(DESTDIR)/usr/lib/xen/boot/pv-grub-$(XEN_TARGET_ARCH).gz"
    3.19 +	$(INSTALL_DIR) "$(DESTDIR)$(LIBDIR_x86_32)/xen/boot"
    3.20 +	$(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-grub/mini-os.gz "$(DESTDIR)$(LIBDIR_x86_32)/xen/boot/pv-grub-$(XEN_TARGET_ARCH).gz"
    3.21  
    3.22  #######
    3.23  # clean

     4.1 --- a/tools/firmware/Makefile	Thu Mar 19 10:24:48 2009 +0000
     4.2 +++ b/tools/firmware/Makefile	Thu Mar 19 14:01:56 2009 +0000
     4.3 @@ -2,9 +2,8 @@ XEN_ROOT = ../..
     4.4  include $(XEN_ROOT)/tools/Rules.mk
     4.5  
     4.6  # hvmloader is a 32-bit protected mode binary.
     4.7 -# It belongs in /usr/lib, not /usr/lib64.
     4.8  TARGET      := hvmloader/hvmloader
     4.9 -INST_DIR := $(DESTDIR)/usr/lib/xen/boot
    4.10 +INST_DIR := $(DESTDIR)$(LIBDIR_x86_32)/xen/boot
    4.11  
    4.12  SUBDIRS :=
    4.13  SUBDIRS += rombios

     5.1 --- a/tools/hotplug/NetBSD/Makefile	Thu Mar 19 10:24:48 2009 +0000
     5.2 +++ b/tools/hotplug/NetBSD/Makefile	Thu Mar 19 14:01:56 2009 +0000
     5.3 @@ -2,14 +2,12 @@ XEN_ROOT = ../../../
     5.4  include $(XEN_ROOT)/tools/Rules.mk
     5.5  
     5.6  # Xen configuration dir and configs to go there.
     5.7 -XEN_CONFIG_DIR = $(PREFIX)/etc/xen
     5.8 +XEN_CONFIG_DIR = /etc/xen
     5.9  
    5.10  # Xen script dir and scripts to go there.
    5.11 -XEN_SCRIPT_DIR = $(PREFIX)/etc/xen/scripts
    5.12 +XEN_SCRIPT_DIR = $(XEN_CONFIG_DIR)/scripts
    5.13  XEN_SCRIPTS =
    5.14  XEN_SCRIPTS += block-nbsd
    5.15 -XEN_SCRIPTS += hvm-nbsd
    5.16 -XEN_SCRIPTS += netbsd1-nbsd
    5.17  XEN_SCRIPTS += qemu-ifup-nbsd
    5.18  XEN_SCRIPTS += vif-bridge-nbsd
    5.19  XEN_SCRIPTS += vif-ip-nbsd
    5.20 @@ -27,7 +25,7 @@ install: all install-scripts
    5.21  
    5.22  .PHONY: install-scripts
    5.23  install-scripts:
    5.24 -	$(INSTALL_DATA_DIR) $(DESTDIR)$(XEN_SCRIPT_DIR)
    5.25 +	$(INSTALL_DIR) $(DESTDIR)$(XEN_SCRIPT_DIR)
    5.26  	set -e; for i in $(XEN_SCRIPTS); \
    5.27  	   do \
    5.28  	   $(INSTALL_DATA) $$i $(DESTDIR)$(XEN_SCRIPT_DIR); \