Fix the .include lines so that make looks in the right place first.

Remember .include "foo.mk" is looked for (first) in the directory that
contains the makefile being processed (like in C), so remove all the
${.PARSEDIR} and ../ sequences that just cause grief.

9 files changed, 19 insertions, 19 deletions

diff --git a/mk/emulator/darwin.mk b/mk/emulator/darwin.mk
index 53f39caf9ca..630a7d2b218 100644
--- a/mk/emulator/darwin.mk
+++ b/mk/emulator/darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: darwin.mk,v 1.2 2007/08/23 17:39:47 jlam Exp $
+# $NetBSD: darwin.mk,v 1.3 2007/10/13 11:04:17 dsl Exp $
 #
 # Darwin (Mac OS X) binary emulation framework
 #
@@ -34,7 +34,7 @@ EMUL_DISTRO=		native-darwin	# native OSF/1 (Tru64)
 EMULDIR=		${PREFIX}
 EMULSUBDIR=		# empty
 .else
-.  include "${.PARSEDIR}/darwin-${_EMUL_TYPE}.mk"
+.  include "darwin-${_EMUL_TYPE}.mk"
 .endif
 
 .if (${_EMUL_TYPE} == "builtin") || (${_EMUL_TYPE} == "native")
diff --git a/mk/emulator/emulator.mk b/mk/emulator/emulator.mk
index e1d13359697..da430fff731 100644
--- a/mk/emulator/emulator.mk
+++ b/mk/emulator/emulator.mk
@@ -1,4 +1,4 @@
-# $NetBSD: emulator.mk,v 1.9 2007/10/09 19:19:13 martti Exp $
+# $NetBSD: emulator.mk,v 1.10 2007/10/13 11:04:17 dsl Exp $
 #
 # This file is included by bsd.pkg.mk.
 #
@@ -72,7 +72,7 @@ OPSYS_EMULDIR?=		# empty
 #
 #	EMUL_DISTRO, EMULSUBDIR, EMULDIR, OPSYS_EMULDIR
 #
-.  include "${.PARSEDIR}/${EMUL_OPSYS}.mk"
+.  include "${EMUL_OPSYS}.mk"
 .endif
 
 # If we're doing true binary emulation, then file paths found in the
@@ -140,7 +140,7 @@ _EMUL_PKG_FMTS+=	rpm
 
 EMUL_PKG_FMT?=		plain
 
-.include "${.PARSEDIR}/pkg-${EMUL_PKG_FMT}.mk"
+.include "pkg-${EMUL_PKG_FMT}.mk"
 
 .PHONY: emul-fetch
 emul-fetch:
diff --git a/mk/emulator/freebsd.mk b/mk/emulator/freebsd.mk
index 85f90a56b59..dbafb20d61e 100644
--- a/mk/emulator/freebsd.mk
+++ b/mk/emulator/freebsd.mk
@@ -1,4 +1,4 @@
-# $NetBSD: freebsd.mk,v 1.2 2007/08/23 17:39:47 jlam Exp $
+# $NetBSD: freebsd.mk,v 1.3 2007/10/13 11:04:17 dsl Exp $
 #
 # FreeBSD binary emulation framework
 #
@@ -33,7 +33,7 @@ EMUL_DISTRO=		native-freebsd		# native FreeBSD installation
 EMULDIR=		${PREFIX}
 EMULSUBDIR=		# empty
 .else
-.  include "${.PARSEDIR}/freebsd-${_EMUL_TYPE}.mk"
+.  include "freebsd-${_EMUL_TYPE}.mk"
 .endif
 
 .if (${_EMUL_TYPE} == "builtin") || (${_EMUL_TYPE} == "native")
diff --git a/mk/emulator/irix.mk b/mk/emulator/irix.mk
index 03aa200e603..d6c95bf8d5b 100644
--- a/mk/emulator/irix.mk
+++ b/mk/emulator/irix.mk
@@ -1,4 +1,4 @@
-# $NetBSD: irix.mk,v 1.2 2007/08/23 17:39:47 jlam Exp $
+# $NetBSD: irix.mk,v 1.3 2007/10/13 11:04:17 dsl Exp $
 #
 # IRIX binary emulation framework
 #
@@ -33,7 +33,7 @@ EMUL_DISTRO=		native-irix	# native IRIX installation
 EMULDIR=		${PREFIX}
 EMULSUBDIR=		# empty
 .else
-.  include "${.PARSEDIR}/irix-${_EMUL_TYPE}.mk"
+.  include "irix-${_EMUL_TYPE}.mk"
 .endif
 
 .if (${_EMUL_TYPE} == "builtin") || (${_EMUL_TYPE} == "native")
diff --git a/mk/emulator/linux.mk b/mk/emulator/linux.mk
index b7f44e714d3..0f07c7bcf1c 100644
--- a/mk/emulator/linux.mk
+++ b/mk/emulator/linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: linux.mk,v 1.3 2007/09/07 23:04:55 wiz Exp $
+# $NetBSD: linux.mk,v 1.4 2007/10/13 11:04:18 dsl Exp $
 #
 # Linux binary emulation framework
 #
@@ -69,7 +69,7 @@ EMUL_DISTRO=		native-linux	# native Linux installation
 EMULDIR=		${PREFIX}
 EMULSUBDIR=		# empty
 .else
-.  include "${.PARSEDIR}/linux-${_EMUL_TYPE}.mk"
+.  include "linux-${_EMUL_TYPE}.mk"
 .endif
 
 .if (${_EMUL_TYPE} == "builtin") || (${_EMUL_TYPE} == "native")
diff --git a/mk/emulator/netbsd.mk b/mk/emulator/netbsd.mk
index 3b521712952..b8b8059c9cd 100644
--- a/mk/emulator/netbsd.mk
+++ b/mk/emulator/netbsd.mk
@@ -1,4 +1,4 @@
-# $NetBSD: netbsd.mk,v 1.2 2007/08/23 17:39:47 jlam Exp $
+# $NetBSD: netbsd.mk,v 1.3 2007/10/13 11:04:18 dsl Exp $
 #
 # NetBSD binary emulation framework
 #
@@ -35,7 +35,7 @@ EMUL_DISTRO=		native-netbsd		# native NetBSD
 EMULDIR=		${PREFIX}
 EMULSUBDIR=		# empty
 .else
-.  include "${.PARSEDIR}/netbsd-${_EMUL_TYPE}.mk"
+.  include "netbsd-${_EMUL_TYPE}.mk"
 .endif
 
 .if (${_EMUL_TYPE} == "builtin") || (${_EMUL_TYPE} == "native")
diff --git a/mk/emulator/osf1.mk b/mk/emulator/osf1.mk
index 97e5058c648..45c6c44cf2b 100644
--- a/mk/emulator/osf1.mk
+++ b/mk/emulator/osf1.mk
@@ -1,4 +1,4 @@
-# $NetBSD: osf1.mk,v 1.3 2007/08/23 17:39:47 jlam Exp $
+# $NetBSD: osf1.mk,v 1.4 2007/10/13 11:04:18 dsl Exp $
 #
 # OSF/1 (Tru64) binary emulation framework
 #
@@ -34,7 +34,7 @@ EMUL_DISTRO=		native-osf1	# native OSF/1 (Tru64)
 EMULDIR=		${PREFIX}
 EMULSUBDIR=		# empty
 .else
-.  include "${.PARSEDIR}/osf1-${_EMUL_TYPE}.mk"
+.  include "osf1-${_EMUL_TYPE}.mk"
 .endif
 
 .if (${_EMUL_TYPE} == "builtin") || (${_EMUL_TYPE} == "native")
diff --git a/mk/emulator/solaris.mk b/mk/emulator/solaris.mk
index db796663efb..e694d362390 100644
--- a/mk/emulator/solaris.mk
+++ b/mk/emulator/solaris.mk
@@ -1,4 +1,4 @@
-# $NetBSD: solaris.mk,v 1.2 2007/08/23 17:39:47 jlam Exp $
+# $NetBSD: solaris.mk,v 1.3 2007/10/13 11:04:18 dsl Exp $
 #
 # Solaris (SVR4) binary emulation framework
 #
@@ -42,7 +42,7 @@ EMUL_DISTRO=		native-solaris		# native SunOS 5.x
 EMULDIR=		${PREFIX}
 EMULSUBDIR=		# empty
 .else
-.  include "${.PARSEDIR}/solaris-${_EMUL_TYPE}.mk"
+.  include "solaris-${_EMUL_TYPE}.mk"
 .endif
 
 .if (${_EMUL_TYPE} == "builtin") || (${_EMUL_TYPE} == "native")
diff --git a/mk/emulator/sunos.mk b/mk/emulator/sunos.mk
index bdd8ae79cb7..8b92271448e 100644
--- a/mk/emulator/sunos.mk
+++ b/mk/emulator/sunos.mk
@@ -1,4 +1,4 @@
-# $NetBSD: sunos.mk,v 1.2 2007/08/23 17:39:47 jlam Exp $
+# $NetBSD: sunos.mk,v 1.3 2007/10/13 11:04:18 dsl Exp $
 #
 # SunOS 4.x binary emulation framework
 #
@@ -33,7 +33,7 @@ EMUL_DISTRO=		native-sunos	# native SunOS 4.x
 EMULDIR=		${PREFIX}
 EMULSUBDIR=		# empty
 .else
-.  include "${.PARSEDIR}/sunos-${_EMUL_TYPE}.mk"
+.  include "sunos-${_EMUL_TYPE}.mk"
 .endif
 
 .if (${_EMUL_TYPE} == "builtin") || (${_EMUL_TYPE} == "native")