summaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
authorxtraeme <xtraeme@pkgsrc.org>2007-04-20 21:35:00 +0000
committerxtraeme <xtraeme@pkgsrc.org>2007-04-20 21:35:00 +0000
commit2d7baee27e3da3abc51b196ccfa5498b5b7218a4 (patch)
tree3bd04080faf39784796c354fe39b84036c8e2299 /emulators
parent9f06f173c674afe477a36c7d3a0a265e613a00f3 (diff)
downloadpkgsrc-2d7baee27e3da3abc51b196ccfa5498b5b7218a4.tar.gz
Fix a problem with SUSE_ARCH and SUSE_ARCH_DIR with compat32 reported
by dsl@, with diagnostic by veego@. compat32.mk overwrites some vars required to make suse work, but it wasn't overwritting those vars for the fetch target. I didn't see that error because I had the distfiles on my DISTDIR.
Diffstat (limited to 'emulators')
-rw-r--r--emulators/suse100_linux/Makefile.common4
-rw-r--r--emulators/suse100_linux/compat32.mk4
2 files changed, 5 insertions, 3 deletions
diff --git a/emulators/suse100_linux/Makefile.common b/emulators/suse100_linux/Makefile.common
index 027aebb4915..9665daa62d5 100644
--- a/emulators/suse100_linux/Makefile.common
+++ b/emulators/suse100_linux/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.13 2007/04/19 15:30:21 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.14 2007/04/20 21:35:00 xtraeme Exp $
.include "../../emulators/suse100_linux/vars.mk"
-.include "../../emulators/suse100_linux/arch.mk"
.include "../../emulators/suse100_linux/compat32.mk"
+.include "../../emulators/suse100_linux/arch.mk"
ONLY_FOR_PLATFORM+= NetBSD-[2-9]*-i386 NetBSD-3.99*-x86_64 \
NetBSD-[2-9]*-powerpc \
diff --git a/emulators/suse100_linux/compat32.mk b/emulators/suse100_linux/compat32.mk
index cf205cb8533..4349b0ef361 100644
--- a/emulators/suse100_linux/compat32.mk
+++ b/emulators/suse100_linux/compat32.mk
@@ -1,9 +1,11 @@
-# $NetBSD: compat32.mk,v 1.3 2007/04/19 21:25:28 xtraeme Exp $
+# $NetBSD: compat32.mk,v 1.4 2007/04/20 21:35:00 xtraeme Exp $
#
.ifndef SUSE_LINUX_COMPAT32_MK
SUSE_LINUX_COMPAT32_MK= # defined
+.include "../../mk/bsd.prefs.mk"
+
. if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "x86_64"
#