[src/netbsd-1-5]: src/bin/ksh Pull up revisions 1.14-1.16 (requested by dogcow):

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4312288ff45a
branches:  netbsd-1-5
changeset: 492863:4312288ff45a
user:      he <he%NetBSD.org@localhost>
date:      Tue Feb 26 19:50:47 2002 +0000

description:
Pull up revisions 1.14-1.16 (requested by dogcow):
  Synchronize with current development version:
   o fix problem with ``set -x'' causing a core dump; fixes PR#11361
   o fix problem with ``set -e'' causing early exit; fixes PR#11542
   o fix various misspellings and nested extern declarations

diffstat:

 bin/ksh/Makefile |  12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r 52b1062ed9aa -r 4312288ff45a bin/ksh/Makefile
--- a/bin/ksh/Makefile  Sun Feb 24 16:18:43 2002 +0000
+++ b/bin/ksh/Makefile  Tue Feb 26 19:50:47 2002 +0000
@@ -1,13 +1,19 @@
-#      $NetBSD: Makefile,v 1.12.6.1 2000/09/03 22:44:02 soren Exp $
+#      $NetBSD: Makefile,v 1.12.6.2 2002/02/26 19:50:47 he Exp $
+
+.include <bsd.own.mk>
 
 CPPFLAGS+=     -DHAVE_CONFIG_H -I.
 
+WARNS?=        1
 PROG=  ksh
 SRCS=  alloc.c c_ksh.c c_sh.c c_test.c c_ulimit.c edit.c emacs.c \
        eval.c exec.c expr.c history.c io.c jobs.c lex.c mail.c \
        main.c misc.c path.c shf.c sigact.c syn.c table.c trap.c \
        tree.c tty.c var.c version.c vi.c
-DPSRCS=        emacs.out siglist.out ksh.1
+DPSRCS=        emacs.out siglist.out
+.if (${MKMAN} != "no")
+DPSRCS+=ksh.1
+.endif
 
 # needs tbl for the man page.
 USETBL= 
@@ -16,7 +22,7 @@
 
 # two steps to prevent the creation of a bogus siglist.out
 siglist.out: config.h sh.h siglist.in siglist.sh
-       sh $(.CURDIR)/siglist.sh "$(CPP) $(CPPFLAGS) $(DEFS) -I. -I$(.CURDIR)" < $(.CURDIR)/siglist.in > tmpsiglist.out
+       sh $(.CURDIR)/siglist.sh "$(CC) -E $(CPPFLAGS) $(DEFS) -I. -I$(.CURDIR)" < $(.CURDIR)/siglist.in > tmpsiglist.out
        mv tmpsiglist.out siglist.out
 
 # two steps to prevent the creation of a bogus emacs.out