5 files changed, 26 insertions, 3 deletions
diff --git a/mk/os-BSD.mk b/mk/os-BSD.mk
new file mode 100644
index 00000000..3032a076
--- /dev/null
+++ b/mk/os-BSD.mk
@@ -0,0 +1,6 @@
+# Copyright 2008 Roy Marples
+
+# Generic definitions
+
+SUBOS=		BSD
+LIBKVM?=	-lkvm
diff --git a/mk/os-FreeBSD.mk b/mk/os-FreeBSD.mk
new file mode 100644
index 00000000..a58741b1
--- /dev/null
+++ b/mk/os-FreeBSD.mk
@@ -0,0 +1,5 @@
+# Copyright 2008 Roy Marples
+
+# Generic definitions
+
+include ${MK}/os-BSD.mk
diff --git a/mk/os-Linux.mk b/mk/os-Linux.mk
new file mode 100644
index 00000000..c79bb576
--- /dev/null
+++ b/mk/os-Linux.mk
@@ -0,0 +1,4 @@
+# Copyright 2008 Roy Marples
+
+CFLAGS+=	-D_BSD_SOURCE -D_XOPEN_SOURCE=600
+LIBDL=		-Wl,-Bdynamic -ldl
diff --git a/mk/os-NetBSD.mk b/mk/os-NetBSD.mk
new file mode 100644
index 00000000..9a05c849
--- /dev/null
+++ b/mk/os-NetBSD.mk
@@ -0,0 +1,6 @@
+# Copyright 2008 Roy Marples
+
+# Generic definitions
+
+PKG_PREFIX?=	/usr/pkg
+include ${MK}/os-BSD.mk
diff --git a/mk/scripts.mk b/mk/scripts.mk
index a77e17e5..ce3b25aa 100644
--- a/mk/scripts.mk
+++ b/mk/scripts.mk
@@ -6,15 +6,17 @@ include ${MK}/os.mk
 
 OBJS+=	${SRCS:.in=}
 
-_SED_REPLACE=	-e 's:@SHELL@:${SH}:g' -e 's:@LIB@:${LIBNAME}:g' -e 's:@SYSCONFDIR@:${SYSCONFDIR}:g' -e 's:@PREFIX@:${PREFIX}:g' -e 's:@PKG_PREFIX@:${PKG_PREFIX}:g' -e 's:@LOCAL_PREFIX@:${LOCAL_PREFIX}:g'
+_SED_PREFIX_SH=		if test "${PREFIX}" = "${PKG_PREFIX}"; then echo "-e 's:@PKG_PREFIX@::g'"; else echo "-e 's:@PKG_PREFIX@:${PKG_PREFIX}:g'"; fi
+_SED_PREFIX!=		${_SED_PREFIX_SH}
+SED_REPLACE=		-e 's:@SHELL@:${SH}:g' -e 's:@LIB@:${LIBNAME}:g' -e 's:@SYSCONFDIR@:${SYSCONFDIR}:g' -e 's:@PREFIX@:${PREFIX}:g' ${_SED_PREFIX}$(shell ${_SED_PREFIX_SH})  -e 's:@LOCAL_PREFIX@:${LOCAL_PREFIX}:g'	
 
 # Tweak our shell scripts
 .SUFFIXES:	.sh.in .in
 .sh.in.sh:
-	sed ${_SED_REPLACE} $< > $@
+	sed ${SED_REPLACE} $< > $@
 
 .in:
-	sed ${_SED_REPLACE} $< > $@
+	sed ${SED_REPLACE} $< > $@
 
 all: ${OBJS}