This commit was generated by cvs2svn to compensate for changes in r86, which

included commits to RCS files with non-trunk default branches.

Makefile

@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.15 2003/08/11 09:41:31 miod Exp $
+#	$OpenBSD: Makefile,v 1.16 2004/01/09 17:10:07 brad Exp $
 
 PROG=	ksh
 SRCS=	alloc.c c_ksh.c c_sh.c c_test.c c_ulimit.c edit.c emacs.c \
@@ -21,7 +21,7 @@ MLINKS=	ksh.1 rksh.1 ksh.1 ulimit.1
 
 siglist.out: config.h sh.h siglist.in siglist.sh
 	/bin/sh ${.CURDIR}/siglist.sh \
-		"${CPP} ${CPPFLAGS} ${DEFS} -I${.CURDIR}" \
+		"${CC} -E ${CPPFLAGS} ${DEFS} -I${.CURDIR}" \
 		< ${.CURDIR}/siglist.in > siglist.out
 
 emacs.out: emacs.c

main.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.25 2003/06/26 00:09:45 deraadt Exp $	*/
+/*	$OpenBSD: main.c,v 1.26 2004/01/08 05:43:14 jmc Exp $	*/
 
 /*
  * startup, main loop, environments and error handling
@@ -177,7 +177,7 @@ main(int argc, char *argv[])
 	}
 
 
-	/* Turn on nohup by default for how - will change to off
+	/* Turn on nohup by default for now - will change to off
 	 * by default once people are aware of its existence
 	 * (at&t ksh does not have a nohup option - it always sends
 	 * the hup).