summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorgrant <grant>2003-04-21 01:54:33 +0000
committergrant <grant>2003-04-21 01:54:33 +0000
commit04aa328f5de133703aa493981b0495c3e274f615 (patch)
treed622607eeba031cce1765552e6738a19d3dd385f /mk
parent375ca8f0c9c45feffa967ef77c0ff355a21e9b0e (diff)
downloadpkgsrc-04aa328f5de133703aa493981b0495c3e274f615.tar.gz
back out previous, it does not work as it should.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.prefs.mk11
1 files changed, 7 insertions, 4 deletions
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