aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr.bin/make/Makefile1
-rw-r--r--usr.bin/make/buf.c3
-rw-r--r--usr.bin/make/buf.h5
-rw-r--r--usr.bin/make/compat.c3
-rw-r--r--usr.bin/make/cond.c3
-rw-r--r--usr.bin/make/config.h5
-rw-r--r--usr.bin/make/dir.c3
-rw-r--r--usr.bin/make/dir.h5
-rw-r--r--usr.bin/make/for.c7
-rw-r--r--usr.bin/make/hash.c3
-rw-r--r--usr.bin/make/hash.h5
-rw-r--r--usr.bin/make/job.c3
-rw-r--r--usr.bin/make/job.h5
-rw-r--r--usr.bin/make/list.h5
-rw-r--r--usr.bin/make/lst.h5
-rw-r--r--usr.bin/make/main.c6
-rw-r--r--usr.bin/make/make.14
-rw-r--r--usr.bin/make/make.h2
-rw-r--r--usr.bin/make/nonints.h2
-rw-r--r--usr.bin/make/pathnames.h2
-rw-r--r--usr.bin/make/sprite.h2
21 files changed, 49 insertions, 30 deletions
diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile
index 4d29da7e0c97b..d9b64caa1f3bf 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 88ed2dfefb73f..ed4310924cff1 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 d6367bee732e4..d3c6afa3edb85 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 788f8b0d1292e..f0d08aae97286 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 3f4ca218a3062..d02452fbdc45c 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 1bf6e9f883e3f..fee8536927f0e 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 7ea7c65bed4db..c00956ca50f40 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 0f84a7b93f961..ec706432a24bb 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 c68604f12a6fc..129d73192a5bd 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 08e257f9e1c89..31d39c643d8ac 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 6809901d9cc46..9e14c53055bec 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 8d709550d6e75..ed1ee089aa42e 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 7626f397e83de..d59bc16165972 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 4c9b3957456e3..3f441e7b6901a 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 565479b368eee..9c18fb3073005 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 faebba6eb95fd..f3c2ca71e7123 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 b8f4574feeffd..f764be92acac9 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 4f4e571bd4acb..63c5ab9cd2c24 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 9e50f4cd9683e..ad1e46d550980 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 1f15c082ead73..d16167cc1f69b 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 6e3207b347dfc..11ecc36b5b083 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$
*/