BSD 4_3_Reno release

[unix-history] / usr / src / usr.bin / make / hash.c

diff --git a/usr/src/usr.bin/make/hash.c b/usr/src/usr.bin/make/hash.c
index 5febbf3..7c24f7e 100644 (file)
--- a/usr/src/usr.bin/make/hash.c
+++ b/usr/src/usr.bin/make/hash.c
@@ -8,12 +8,14 @@
  * Adam de Boor.
  *
  * Redistribution and use in source and binary forms are permitted
  * Adam de Boor.
  *
  * Redistribution and use in source and binary forms are permitted

- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
+ * provided that: (1) source distributions retain this entire copyright
+ * notice and comment, and (2) distributions including binaries display
+ * the following acknowledgement:  ``This product includes software
+ * developed by the University of California, Berkeley and its contributors''
+ * in the documentation or other materials provided with the distribution
+ * and in all advertising materials mentioning features or use of this
+ * software. Neither the name of the University nor the names of its
+ * contributors may be used to endorse or promote products derived

  * from this software without specific prior written permission.
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * from this software without specific prior written permission.
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED


@@ -21,7 +23,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)hash.c     5.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)hash.c     5.4 (Berkeley) 6/1/90";

 #endif /* not lint */
 
 /* hash.c --
 #endif /* not lint */
 
 /* hash.c --