[pkgsrc/trunk]: pkgsrc/emulators/suse91_linux Packages in two different direc...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6eefbea00f56
branches:  trunk
changeset: 535053:6eefbea00f56
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Tue Nov 06 23:30:15 2007 +0000

description:
Packages in two different directories should always generate different
PKGNAMEs. The packages in suse91_* and suse91_32_* didn't do that.

One effect of this was that the pbulk framework didn't record the
packages from both directories. It only took the first one, which
happened to be the suse91_32_* (which aren't available for i386). The
others were disarded, so effectively all Linux binary packages were
skipped.

diffstat:

 emulators/suse91_linux/Makefile.common |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 31223f2b6e99 -r 6eefbea00f56 emulators/suse91_linux/Makefile.common
--- a/emulators/suse91_linux/Makefile.common    Tue Nov 06 22:48:15 2007 +0000
+++ b/emulators/suse91_linux/Makefile.common    Tue Nov 06 23:30:15 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2007/08/23 18:20:31 jlam Exp $
+# $NetBSD: Makefile.common,v 1.20 2007/11/06 23:30:15 rillig Exp $
 
 SUSE_PKG=              yes
 SUSE_VERSION=          9.1
@@ -60,7 +60,7 @@
 PATCHDIR=              ${SUSE_PKGSRCDIR}/patches
 PKGDIR=                        ${SUSE_PKGSRCDIR}
 
-.if (${EMUL_ARCH} == "i386") && (${MACHINE_ARCH} == "x86_64")
+.if defined(SUSE_COMPAT32)
 PKGNAME:=              ${DISTNAME:S/^suse_/suse32_/}
 COMMENT:=              ${COMMENT:S/Linux/Linux 32-bit/}
 LINUX_BASE=            linux32