summaryrefslogtreecommitdiff
path: root/usr.bin/make/dir.h
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>1996-11-30 21:09:23 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>1996-11-30 21:09:23 +0000
commit67e9b81bf2c3acfeba94fdb222f197904c16cfef (patch)
treed3c86e29fa60fc56eb72f9263478434f9b2f3607 /usr.bin/make/dir.h
parent66030e0876e2f9722b759c1df2901e526a7be102 (diff)
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.
Diffstat (limited to 'usr.bin/make/dir.h')
-rw-r--r--usr.bin/make/dir.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/make/dir.h b/usr.bin/make/dir.h
index e0bf9bf2767..3e47c6b64fa 100644
--- a/usr.bin/make/dir.h
+++ b/usr.bin/make/dir.h
@@ -1,5 +1,5 @@
-/* $OpenBSD: dir.h,v 1.2 1996/06/26 05:36:30 deraadt Exp $ */
-/* $NetBSD: dir.h,v 1.3 1995/06/14 15:19:11 christos Exp $ */
+/* $OpenBSD: dir.h,v 1.3 1996/11/30 21:08:54 millert Exp $ */
+/* $NetBSD: dir.h,v 1.4 1996/11/06 17:59:05 christos Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -38,7 +38,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * from: @(#)dir.h 5.4 (Berkeley) 12/28/90
+ * from: @(#)dir.h 8.1 (Berkeley) 6/6/93
*/
/* dir.h --