Fix copyrights, and undo SCS ID damage.

21 files changed, 49 insertions, 30 deletions

diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile
index 4d29da7..d9b64ca 100644
--- a/usr.bin/make/Makefile
+++ b/usr.bin/make/Makefile
@@ -1,4 +1,5 @@
 #	@(#)Makefile	5.2 (Berkeley) 12/28/90
+#	$Id: Makefile,v 1.6 1994/06/30 05:33:39 cgd Exp $
 # $FreeBSD$
 
 PROG=	make
diff --git a/usr.bin/make/buf.c b/usr.bin/make/buf.c
index 88ed2df..ed43109 100644
--- a/usr.bin/make/buf.c
+++ b/usr.bin/make/buf.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
  * All rights reserved.
diff --git a/usr.bin/make/buf.h b/usr.bin/make/buf.h
index d6367be..d3c6afa 100644
--- a/usr.bin/make/buf.h
+++ b/usr.bin/make/buf.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
  * All rights reserved.
@@ -35,7 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)buf.h	8.1 (Berkeley) 6/6/93
+ *	@(#)buf.h	8.2 (Berkeley) 4/28/95
  * $FreeBSD$
  */
 
diff --git a/usr.bin/make/compat.c b/usr.bin/make/compat.c
index 788f8b0..f0d08aa 100644
--- a/usr.bin/make/compat.c
+++ b/usr.bin/make/compat.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
  * All rights reserved.
diff --git a/usr.bin/make/cond.c b/usr.bin/make/cond.c
index 3f4ca21..d02452f 100644
--- a/usr.bin/make/cond.c
+++ b/usr.bin/make/cond.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
  * All rights reserved.
diff --git a/usr.bin/make/config.h b/usr.bin/make/config.h
index 1bf6e9f..fee8536 100644
--- a/usr.bin/make/config.h
+++ b/usr.bin/make/config.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
  * All rights reserved.
@@ -35,7 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)config.h	8.1 (Berkeley) 6/6/93
+ *	@(#)config.h	8.2 (Berkeley) 4/28/95
  * $FreeBSD$
  */
 
diff --git a/usr.bin/make/dir.c b/usr.bin/make/dir.c
index 7ea7c65..c00956c 100644
--- a/usr.bin/make/dir.c
+++ b/usr.bin/make/dir.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
  * All rights reserved.
diff --git a/usr.bin/make/dir.h b/usr.bin/make/dir.h
index 0f84a7b..ec70643 100644
--- a/usr.bin/make/dir.h
+++ b/usr.bin/make/dir.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
  * All rights reserved.
@@ -35,7 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)dir.h	8.1 (Berkeley) 6/6/93
+ *	@(#)dir.h	8.2 (Berkeley) 4/28/95
  * $FreeBSD$
  */
 
diff --git a/usr.bin/make/for.c b/usr.bin/make/for.c
index c68604f..129d731 100644
--- a/usr.bin/make/for.c
+++ b/usr.bin/make/for.c
@@ -1,6 +1,9 @@
 /*
- * Copyright (c) 1992, The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Christos Zoulas.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/usr.bin/make/hash.c b/usr.bin/make/hash.c
index 08e257f..31d39c6 100644
--- a/usr.bin/make/hash.c
+++ b/usr.bin/make/hash.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
  * All rights reserved.
diff --git a/usr.bin/make/hash.h b/usr.bin/make/hash.h
index 6809901..9e14c53 100644
--- a/usr.bin/make/hash.h
+++ b/usr.bin/make/hash.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
  * All rights reserved.
@@ -35,7 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)hash.h	8.1 (Berkeley) 6/6/93
+ *	@(#)hash.h	8.1 (Berkeley) 6/6/93
  * $FreeBSD$
  */
 
diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c
index 8d70955..ed1ee08 100644
--- a/usr.bin/make/job.c
+++ b/usr.bin/make/job.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
  * All rights reserved.
diff --git a/usr.bin/make/job.h b/usr.bin/make/job.h
index 7626f39..d59bc16 100644
--- a/usr.bin/make/job.h
+++ b/usr.bin/make/job.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
  * All rights reserved.
@@ -35,7 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)job.h	8.1 (Berkeley) 6/6/93
+ *	@(#)job.h	8.1 (Berkeley) 6/6/93
  * $FreeBSD$
  */
 
diff --git a/usr.bin/make/list.h b/usr.bin/make/list.h
index 4c9b395..3f441e7 100644
--- a/usr.bin/make/list.h
+++ b/usr.bin/make/list.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
  * All rights reserved.
@@ -35,7 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)list.h	8.1 (Berkeley) 6/6/93
+ *	@(#)list.h	8.2 (Berkeley) 4/28/95
  * $FreeBSD$
  */
 
diff --git a/usr.bin/make/lst.h b/usr.bin/make/lst.h
index 565479b..9c18fb3 100644
--- a/usr.bin/make/lst.h
+++ b/usr.bin/make/lst.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
  * All rights reserved.
@@ -35,7 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)lst.h	8.1 (Berkeley) 6/6/93
+ *	@(#)lst.h	8.2 (Berkeley) 4/28/95
  * $FreeBSD$
  */
 
diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c
index faebba6..f3c2ca7 100644
--- a/usr.bin/make/main.c
+++ b/usr.bin/make/main.c
@@ -38,10 +38,12 @@
  * @(#)main.c      8.3 (Berkeley) 3/19/94
  */
 
-#include <sys/cdefs.h>
 #ifndef lint
-__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993  The Regents of the University of California.  All rights reserved.");
+static char copyright[] =
+"@(#) Copyright (c) 1988, 1989, 1990, 1993\n\
+	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
+#include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 /*-
diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index b8f4574..f764be9 100644
--- a/usr.bin/make/make.1
+++ b/usr.bin/make/make.1
@@ -29,10 +29,10 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	from: @(#)make.1	8.4 (Berkeley) 3/19/94
+.\"	@(#)make.1	8.8 (Berkeley) 6/13/95
 .\" $FreeBSD$
 .\"
-.Dd March 19, 1994
+.Dd June 13, 1995
 .Dt MAKE 1
 .Os
 .Sh NAME
diff --git a/usr.bin/make/make.h b/usr.bin/make/make.h
index 4f4e571..63c5ab9 100644
--- a/usr.bin/make/make.h
+++ b/usr.bin/make/make.h
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)make.h	8.3 (Berkeley) 6/13/95
+ *	@(#)make.h	8.3 (Berkeley) 6/13/95
  * $FreeBSD$
  */
 
diff --git a/usr.bin/make/nonints.h b/usr.bin/make/nonints.h
index 9e50f4c..ad1e46d 100644
--- a/usr.bin/make/nonints.h
+++ b/usr.bin/make/nonints.h
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)nonints.h	8.3 (Berkeley) 3/19/94
+ *	@(#)nonints.h	8.4 (Berkeley) 4/28/95
  * $FreeBSD$
  */
 
diff --git a/usr.bin/make/pathnames.h b/usr.bin/make/pathnames.h
index 1f15c08..d16167c 100644
--- a/usr.bin/make/pathnames.h
+++ b/usr.bin/make/pathnames.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)pathnames.h	5.2 (Berkeley) 6/1/90
+ *	@(#)pathnames.h	8.2 (Berkeley) 4/28/95
  * $FreeBSD$
  */
 
diff --git a/usr.bin/make/sprite.h b/usr.bin/make/sprite.h
index 6e3207b..11ecc36 100644
--- a/usr.bin/make/sprite.h
+++ b/usr.bin/make/sprite.h
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)sprite.h	8.1 (Berkeley) 6/6/93
+ *	@(#)sprite.h	8.2 (Berkeley) 4/28/95
  * $FreeBSD$
  */