diff -r 0b13d9787622 config/NetBSD.mk
--- a/config/NetBSD.mk	Tue Mar 24 06:55:29 2009 +0000
+++ b/config/NetBSD.mk	Fri Mar 27 16:21:23 2009 +0100
@@ -4,5 +4,5 @@ include $(XEN_ROOT)/config/StdGNU.mk
 CURSES_LIBS = -lcurses
 
 LIBLEAFDIR_x86_64 = lib
-LIBEXEC = $(PREFIX)/libexec
+LIBEXEC = libexec
 PRIVATE_BINDIR = $(BINDIR)
diff -r 0b13d9787622 config/StdGNU.mk
--- a/config/StdGNU.mk	Tue Mar 24 06:55:29 2009 +0000
+++ b/config/StdGNU.mk	Fri Mar 27 16:21:23 2009 +0100
@@ -30,7 +30,7 @@ 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
+LIBEXEC = $(LIBLEAFDIR_x86_32)/xen/bin
 MANDIR = $(PREFIX)/share/man
 MAN1DIR = $(MANDIR)/man1
 MAN8DIR = $(MANDIR)/man8
diff -r 0b13d9787622 tools/Rules.mk
--- a/tools/Rules.mk	Tue Mar 24 06:55:29 2009 +0000
+++ b/tools/Rules.mk	Fri Mar 27 16:21:23 2009 +0100
@@ -33,10 +33,12 @@ CFLAGS += -D__XEN_TOOLS__
 CFLAGS += -MMD -MF .$(@F).d
 DEPS = .*.d
 
+ifneq ($(XEN_OS),NetBSD)
 # Enable implicit LFS support *and* explicit LFS names.
 CFLAGS  += $(shell getconf LFS_CFLAGS)
 CFLAGS  += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
 LDFLAGS += $(shell getconf LFS_LDFLAGS)
+endif
 
 # 32-bit x86 does not perform well with -ve segment accesses on Xen.
 CFLAGS-$(CONFIG_X86_32) += $(call cc-option,$(CC),-mno-tls-direct-seg-refs)