Make sure we don't pick a bad shell. okay naddy@

This commit is contained in:
espie 2001-10-24 11:58:57 +00:00
parent 5906a566ef
commit 5cfab3ba38
2 changed files with 16 additions and 4 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2001/10/02 13:17:45 naddy Exp $
# $OpenBSD: Makefile,v 1.4 2001/10/24 11:58:57 espie Exp $
COMMENT= "official AT&T release of KornShell 93"
@ -40,7 +40,7 @@ post-patch:
.endif
do-build:
cd ${WRKBUILD} && ./bin/package make ${MAKE_FLAGS}
cd ${WRKBUILD} && SHELL=/bin/sh ./bin/package make ${MAKE_FLAGS}
do-install:
${INSTALL_PROGRAM} ${WRKBUILD}/arch/openbsd.${ARCH}/bin/ksh \

View File

@ -1,6 +1,5 @@
$OpenBSD: patch-bin_package,v 1.2 2001/10/12 17:01:42 naddy Exp $
--- bin/package.orig Thu Aug 23 08:43:30 2001
+++ bin/package Fri Oct 12 18:48:50 2001
+++ bin/package Tue Oct 23 14:10:24 2001
@@ -12,7 +12,7 @@ version=2001-08-11
src="cmd contrib etc lib"
@ -10,3 +9,16 @@ $OpenBSD: patch-bin_package,v 1.2 2001/10/12 17:01:42 naddy Exp $
ccs="/usr/kvm /usr/ccs/bin"
org="gnu GNU"
makefiles="Mamfile Nmakefile nmakefile Makefile makefile"
@@ -2187,9 +2187,9 @@ $PACKAGE_USE)
for i in ksh sh bash
do if executable $i
then case `$_executable_ -c 'echo $KSH_VERSION'` in
- *[Pp][Dd]*)
- : pd ksh is unreliable
- ;;
+# *[Pp][Dd]*)
+# : pd ksh is unreliable
+# ;;
*) SHELL=$_executable_
break
;;