From 04aa328f5de133703aa493981b0495c3e274f615 Mon Sep 17 00:00:00 2001
From: grant <grant>
Date: Mon, 21 Apr 2003 01:54:33 +0000
Subject: back out previous, it does not work as it should.

---
 mk/bsd.prefs.mk | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'mk')

diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index 0ce12653ede..e9201536b2c 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.111 2003/04/21 01:35:10 grant Exp $
+# $NetBSD: bsd.prefs.mk,v 1.112 2003/04/21 01:54:33 grant Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -70,9 +70,6 @@ LOWER_VENDOR?=		unknown
 .  endif
 
 .elif ${OPSYS} == "SunOS"
-LOWER_OPSYS?=		solaris
-LOWER_ARCH!=		${UNAME} -p
-MAKEFLAGS+=		LOWER_ARCH=${LOWER_ARCH}
 .  if ${MACHINE_ARCH} == "sparc"
 SPARC_TARGET_ARCH?=	sparcv7
 .  elif ${MACHINE_ARCH} == "sun4"
@@ -80,8 +77,14 @@ MACHINE_ARCH=		sparc
 SPARC_TARGET_ARCH?=	sparcv7
 .  elif ${MACHINE_ARCH} == "i86pc"
 MACHINE_ARCH=		i386
+.  elif ${MACHINE_ARCH} == "unknown"
+.    if !defined(LOWER_ARCH)
+LOWER_ARCH!=		${UNAME} -p
+.    endif	# !defined(LOWER_ARCH)
+MAKEFLAGS+=		LOWER_ARCH=${LOWER_ARCH}
 .  endif
 LOWER_VENDOR?=		sun
+LOWER_OPSYS?=		solaris
 
 .elif ${OPSYS} == "Linux"
 LOWER_OPSYS?=		linux
-- 
cgit v1.2.3