diff options
author | grant <grant@pkgsrc.org> | 2003-04-21 01:54:33 +0000 |
---|---|---|
committer | grant <grant@pkgsrc.org> | 2003-04-21 01:54:33 +0000 |
commit | 9794a404b17a615089e45d8607fb6d2ca004011f (patch) | |
tree | d622607eeba031cce1765552e6738a19d3dd385f /mk | |
parent | dabc7cd848d441102e23f6097b14a93b95fd87f5 (diff) | |
download | pkgsrc-9794a404b17a615089e45d8607fb6d2ca004011f.tar.gz |
back out previous, it does not work as it should.
Diffstat (limited to 'mk')
-rw-r--r-- | mk/bsd.prefs.mk | 11 |
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 |