From ecbdb32a13ae5759674e9ea7feac09886cf78ce5 Mon Sep 17 00:00:00 2001 From: jlam Date: Mon, 30 Jul 2007 13:38:41 +0000 Subject: s/_LINUX_MODULES/_EMUL_MODULES/g _LINUX_MODULES was an old, internal name I used in my development of the emulator framework that I had renamed to _EMUL_MODULES everywhere, or so I had thought. This should fix the problem where the dependencies on suse_* weren't being converted into dependencies on suse32_* on x86_64 platforms when building a "linux-i386" package. --- emulators/suse100_linux/emulator.mk | 4 ++-- emulators/suse91_linux/emulator.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/emulators/suse100_linux/emulator.mk b/emulators/suse100_linux/emulator.mk index ce0a086ffa3..291b2aa1fa2 100644 --- a/emulators/suse100_linux/emulator.mk +++ b/emulators/suse100_linux/emulator.mk @@ -1,4 +1,4 @@ -# $NetBSD: emulator.mk,v 1.2 2007/07/29 08:55:32 jlam Exp $ +# $NetBSD: emulator.mk,v 1.3 2007/07/30 13:38:41 jlam Exp $ # # This file is included by linux-suse.mk in the emulator framework. # @@ -43,7 +43,7 @@ DEPENDS_suse-10.0.x11?= suse_x11${_SUSE_VERSION_REQD}:../../emulators/suse100_x1 DEPENDS_suse-10.0.xml2?= suse_libxml2${_SUSE_VERSION_REQD}:../../emulators/suse100_libxml2 .if (${EMUL_ARCH} == "i386") && (${MACHINE_ARCH} == "x86_64") -. for _mod_ in ${_LINUX_MODULES} +. for _mod_ in ${_EMUL_MODULES} DEPENDS_suse-10.0.${_mod_}:= \ ${DEPENDS_suse-10.0.${_mod_}:S/^suse_/suse32_/:S/suse100_/&32_/} . endfor diff --git a/emulators/suse91_linux/emulator.mk b/emulators/suse91_linux/emulator.mk index 687cedd3b6b..e8cee19966e 100644 --- a/emulators/suse91_linux/emulator.mk +++ b/emulators/suse91_linux/emulator.mk @@ -1,4 +1,4 @@ -# $NetBSD: emulator.mk,v 1.2 2007/07/29 08:55:39 jlam Exp $ +# $NetBSD: emulator.mk,v 1.3 2007/07/30 13:38:41 jlam Exp $ # # This file is included by linux-suse.mk in the emulator framework. # @@ -40,7 +40,7 @@ DEPENDS_suse-9.1.vmware?= suse_vmware${_SUSE_VERSION_REQD}:../../emulators/suse9 DEPENDS_suse-9.1.x11?= suse_x11${_SUSE_VERSION_REQD}:../../emulators/suse91_x11 .if (${EMUL_ARCH} == "i386") && (${MACHINE_ARCH} == "x86_64") -. for _mod_ in ${_LINUX_MODULES} +. for _mod_ in ${_EMUL_MODULES} DEPENDS_suse-9.1.${_mod_}:= \ ${DEPENDS_suse-9.1.${_mod_}:S/^suse_/suse32_/:S/suse91_/&32_/} . endfor -- cgit v1.2.3