summaryrefslogtreecommitdiff
path: root/bootstrap
diff options
context:
space:
mode:
authorheinz <heinz@pkgsrc.org>2004-04-11 03:12:17 +0000
committerheinz <heinz@pkgsrc.org>2004-04-11 03:12:17 +0000
commit786653cc1a20731364ea27679bd47d15554ebba6 (patch)
treee032a15ca7a30932c511576f1daf3c90549eb2e1 /bootstrap
parent26f4edce8794b944f08293790055d8c931185d82 (diff)
downloadpkgsrc-786653cc1a20731364ea27679bd47d15554ebba6.tar.gz
Ksh on Unixware has problems with IFS in sub shells, so put the
splitting of PATH on a separate line. Use 'uname -v' instead of 'uname -r' on Unixware. The release number of UNIX SYSV (ie, R5) is less important to us than the version (7.x.y).
Diffstat (limited to 'bootstrap')
-rwxr-xr-xbootstrap/bmake/machine.sh9
1 files changed, 7 insertions, 2 deletions
diff --git a/bootstrap/bmake/machine.sh b/bootstrap/bmake/machine.sh
index 14f198f687f..8d70608ebae 100755
--- a/bootstrap/bmake/machine.sh
+++ b/bootstrap/bmake/machine.sh
@@ -2,7 +2,7 @@
# derrived from /etc/rc_d/os.sh
# RCSid:
-# $Id: machine.sh,v 1.1.1.1 2004/03/11 13:04:08 grant Exp $
+# $Id: machine.sh,v 1.2 2004/04/11 03:12:17 heinz Exp $
#
# @(#) Copyright (c) 1994 Simon J. Gerraty
#
@@ -26,7 +26,8 @@ MACHINE=
# Great! Solaris keeps moving arch(1)
# we need this here, and it is not always available...
Which() {
- for d in `IFS=:; echo ${2:-$PATH}`
+ pathcomponents=`IFS=:; echo ${2:-$PATH}`
+ for d in ${pathcomponents}
do
test -x $d/$1 && { echo $d/$1; break; }
done
@@ -61,6 +62,10 @@ Interix)
MACHINE=i386
MACHINE_ARCH=i386
;;
+UnixWare)
+ OSREL=`uname -v`
+ OSMAJOR=`IFS=.; set $OSREL; echo $1`
+ ;;
esac
MACHINE=${MACHINE:-$OS$OSMAJOR}