Sync with NetBSD:

- Merge in FreeBSD and Lite2 changes.
- Fix bug where a non-archive target with a .a suffix would always
  be considered to be out of date, since it does not have a TOC.
- Fix NetBSD PR #2930: declare missing variable.

1 files changed, 7 insertions, 7 deletions

diff --git a/usr.bin/make/lst.lib/lstMember.c b/usr.bin/make/lst.lib/lstMember.c
index 9cf2a98831b..679d04ae417 100644
--- a/usr.bin/make/lst.lib/lstMember.c
+++ b/usr.bin/make/lst.lib/lstMember.c
@@ -1,9 +1,9 @@
-/*	$OpenBSD: lstMember.c,v 1.2 1996/06/26 05:36:53 deraadt Exp $	*/
-/*	$NetBSD: lstMember.c,v 1.4 1995/06/14 15:21:32 christos Exp $	*/
+/*	$OpenBSD: lstMember.c,v 1.3 1996/11/30 21:09:20 millert Exp $	*/
+/*	$NetBSD: lstMember.c,v 1.5 1996/11/06 17:59:48 christos Exp $	*/
 
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
@@ -39,9 +39,9 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)lstMember.c	5.3 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)lstMember.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: lstMember.c,v 1.2 1996/06/26 05:36:53 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: lstMember.c,v 1.3 1996/11/30 21:09:20 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -64,7 +64,7 @@ Lst_Member (l, d)
     if (lNode == NilListNode) {
 	return NILLNODE;
     }
-    
+
     do {
 	if (lNode->datum == d) {
 	    return (LstNode)lNode;