Back out previous and solve this in another way that doesn't involve

a hokey new emulator-opsys.mk file.

2 files changed, 35 insertions, 48 deletions

diff --git a/mk/emulator/emulator-opsys.mk b/mk/emulator/emulator-opsys.mk
deleted file mode 100644
index f931d0ac7fb..00000000000
--- a/mk/emulator/emulator-opsys.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-# $NetBSD: emulator-opsys.mk,v 1.1 2007/08/23 15:59:33 jlam Exp $
-#
-# This file is included by emulator.mk.
-#
-# Variables defined by this file:
-#
-# EMUL_DISTRO
-#	The distribution of the emulated operating system being used,
-#	e.g. native-linux, suse-10.0, etc.  If the package isn't
-#	supported on this machine, then its value is "none".
-#
-# EMULDIR
-#	Convenience variable that expands to ${PREFIX}/${EMULSUBDIR}
-#
-# EMULSUBDIR
-#	Path relative to ${PREFIX} where the files and directories
-#	are located, e.g. emul/linux.
-#
-# OPSYS_EMULDIR
-#	Path through which the platform expects to find a "chroot"
-#	installation of the files and directories, e.g. /emul/linux.
-#
-
-.if !defined(_EMULATOR_EMULATOR_OPSYS_MK)
-_EMULATOR_EMULATOR_OPSYS_MK=	defined
-
-.if empty(EMUL_PLATFORMS:M${EMUL_PLATFORM})
-PKG_FAIL_REASON+=	"${PKGNAME} is not available for ${MACHINE_PLATFORM}"
-.endif
-
-.if ${EMUL_PLATFORM} == "none"
-EMUL_DISTRO?=		none
-EMULSUBDIR?=		# empty
-EMULDIR?=		${PREFIX}
-OPSYS_EMULDIR?=		# empty
-.else
-#
-# The ${EMUL_OPSYS}.mk file included here should define the following
-# variables either directly or indirectly:
-#
-#	EMUL_DISTRO, EMULSUBDIR, EMULDIR, OPSYS_EMULDIR
-#
-.  include "${.PARSEDIR}/${EMUL_OPSYS}.mk"
-.endif
-
-.endif	# _EMULATOR_EMULATOR_OPSYS_MK
diff --git a/mk/emulator/emulator.mk b/mk/emulator/emulator.mk
index 46ae5e1a9e7..257c487a5ba 100644
--- a/mk/emulator/emulator.mk
+++ b/mk/emulator/emulator.mk
@@ -1,4 +1,4 @@
-# $NetBSD: emulator.mk,v 1.5 2007/08/23 15:59:34 jlam Exp $
+# $NetBSD: emulator.mk,v 1.6 2007/08/23 17:31:46 jlam Exp $
 #
 # This file is included by bsd.pkg.mk.
 #
@@ -17,6 +17,22 @@
 #
 # Variables defined by this file:
 #
+# EMUL_DISTRO
+#	The distribution of the emulated operating system being used,
+#	e.g. native-linux, suse-10.0, etc.  If the package isn't
+#	supported on this machine, then its value is "none".
+#
+# EMULDIR
+#	Convenience variable that expands to ${PREFIX}/${EMULSUBDIR}
+#
+# EMULSUBDIR
+#	Path relative to ${PREFIX} where the files and directories
+#	are located, e.g. emul/linux.
+#
+# OPSYS_EMULDIR
+#	Path through which the platform expects to find a "chroot"
+#	installation of the files and directories, e.g. /emul/linux.
+#
 # EMULSUBDIRSLASH
 #	Expands to either ${EMULSUBDIR}/lib or just lib depending on
 #	whether EMULSUBDIR is empty or not.  It is meant to be used
@@ -36,7 +52,24 @@
 #	of the ``emul-fetch'' target.
 #
 
-.include "${.PARSEDIR}/emulator-opsys.mk"
+.if empty(EMUL_PLATFORMS:M${EMUL_PLATFORM})
+PKG_FAIL_REASON+=	"${PKGNAME} is not available for ${MACHINE_PLATFORM}"
+.endif
+
+.if ${EMUL_PLATFORM} == "none"
+EMUL_DISTRO?=		none
+EMULSUBDIR?=		# empty
+EMULDIR?=		${PREFIX}
+OPSYS_EMULDIR?=		# empty
+.else
+#
+# The ${EMUL_OPSYS}.mk file included here should define the following
+# variables either directly or indirectly:
+#
+#	EMUL_DISTRO, EMULSUBDIR, EMULDIR, OPSYS_EMULDIR
+#
+.  include "${.PARSEDIR}/${EMUL_OPSYS}.mk"
+.endif
 
 # If we're doing true binary emulation, then file paths found in the
 # package's binaries, libraries and scripts won't necessarily match the